Changeset 414

Timestamp:

Mar 12, 2020, 4:49:45 PM (4 years ago)

Author:

nmir-saito

Message:

support ruby configurator(file's charactor code is converted to UTF-8)

Location:

ssp_armv6_m_gcc/branches/rubycfg

Files:

• armv6_m_gcc/MANIFEST (modified) (1 prop)
• armv6_m_gcc/Makefile.prc (modified) (3 diffs, 1 prop)
• armv6_m_gcc/arm_m.h (modified) (1 prop)
• armv6_m_gcc/prc.tf (modified) (1 prop)
• armv6_m_gcc/prc_cfg1_out.h (modified) (1 prop)
• armv6_m_gcc/prc_check.tf (modified) (1 prop)
• armv6_m_gcc/prc_check.trb (copied) (copied from rubycfg_ssp/trunk/prc_check.trb )
• armv6_m_gcc/prc_config.c (modified) (1 prop)
• armv6_m_gcc/prc_config.h (modified) (1 prop)
• armv6_m_gcc/prc_def.csv (deleted)
• armv6_m_gcc/prc_insn.h (modified) (1 prop)
• armv6_m_gcc/prc_kernel.h (modified) (1 prop)
• armv6_m_gcc/prc_kernel.trb (copied) (copied from rubycfg_ssp/trunk/prc_kernel.trb ) (5 diffs)
• armv6_m_gcc/prc_rename.def (modified) (1 prop)
• armv6_m_gcc/prc_rename.h (modified) (1 prop)
• armv6_m_gcc/prc_sil.h (modified) (1 prop)
• armv6_m_gcc/prc_stddef.h (modified) (1 prop)
• armv6_m_gcc/prc_support.S (modified) (1 prop)
• armv6_m_gcc/prc_sym.def (copied) (copied from rubycfg_ssp/trunk/prc_sym.def )
• armv6_m_gcc/prc_test.h (modified) (1 prop)
• armv6_m_gcc/prc_timer.c (modified) (1 prop)
• armv6_m_gcc/prc_timer.cfg (modified) (1 prop)
• armv6_m_gcc/prc_timer.h (modified) (1 prop)
• armv6_m_gcc/prc_unrename.h (modified) (1 prop)
• armv6_m_gcc/prc_user.txt (modified) (1 prop)
• armv6_m_gcc/start.S (modified) (1 prop)
• build_ssp.sh (copied) (copied from ssp_aarch64/trunk/build_ssp.sh ) (1 diff)
• install.sh (copied) (copied from ssp_aarch64/trunk/install.sh ) (1 diff)
• lpcxpresso_lpc812_gcc/E_PACKAGE (modified) (1 prop)
• lpcxpresso_lpc812_gcc/LPC812M101FDH20.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/MANIFEST (modified) (1 prop)
• lpcxpresso_lpc812_gcc/Makefile.target (modified) (6 diffs, 1 prop)
• lpcxpresso_lpc812_gcc/lpcxpresso_lpc812.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/lpcxpresso_lpc812.ld (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target.tf (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_cfg1_out.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_check.tf (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_check.trb (copied) (copied from rubycfg_ssp/trunk/target_check.trb )
• lpcxpresso_lpc812_gcc/target_config.c (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_config.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_kernel.cfg (copied) (copied from rubycfg_ssp/trunk/target_kernel.cfg )
• lpcxpresso_lpc812_gcc/target_kernel.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_kernel.trb (copied) (copied from rubycfg_ssp/trunk/target_kernel.trb )
• lpcxpresso_lpc812_gcc/target_rename.def (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_rename.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_serial.c (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_serial.cfg (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_serial.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_sil.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_stddef.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_support.S (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_sym.def (moved) (moved from ssp_armv6_m_gcc/branches/rubycfg/lpcxpresso_lpc812_gcc/target_def.csv ) (1 prop)
• lpcxpresso_lpc812_gcc/target_syssvc.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_test.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_timer.cfg (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_timer.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_unrename.h (modified) (1 prop)
• lpcxpresso_lpc812_gcc/target_user.txt (modified) (1 prop)
• setup_tools.sh (copied) (copied from ssp_aarch64/trunk/setup_tools.sh ) (1 diff)

ssp_armv6_m_gcc/branches/rubycfg/armv6_m_gcc/Makefile.prc

@@ -1 +1 @@
 #
 #  @(#) $Id: Makefile.prc 1304 2008-08-27 07:28:36Z ertl-honda $
-# 
+#
 
 #
@@ -7 +7 @@
 #
 
+PRCDIR = $(SRCDIR)/arch/$(PRC)_$(TOOL)
+
 #
 #  コンパイルオプション
 #
-INCLUDES := $(INCLUDES) -I$(SRCDIR)/arch/$(PRC)_$(TOOL)/
-LDFLAGS := -nostdlib $(LDFLAGS) 
+COPTS := $(COPTS)
 CDEFS := $(CDEFS) -DTOPPERS_LABEL_ASM
+INCLUDES := $(INCLUDES) -I$(PRCDIR)
+LDFLAGS := -nostdlib $(LDFLAGS)
 LIBS := $(LIBS)  -lgcc
 
@@ -18 +21 @@
 #  カーネルに関する定義
 #
-KERNEL_DIR := $(KERNEL_DIR) $(SRCDIR)/arch/$(PRC)_$(TOOL)
+KERNEL_DIRS := $(KERNEL_DIRS) $(PRCDIR)
 KERNEL_ASMOBJS := $(KERNEL_ASMOBJS) prc_support.o
 KERNEL_COBJS := $(KERNEL_COBJS) prc_config.o prc_timer.o
+KERNEL_CFLAGS := $(KERNEL_CFLAGS)
 
 #
 #  コンフィギュレータ関係の変数の定義
 #
-CFG_TABS := $(CFG_TABS) --cfg1-def-table $(SRCDIR)/arch/$(PRC)_$(TOOL)/prc_def.csv
+CFG_TABS := $(CFG_TABS) --symval-table $(PRCDIR)/prc_sym.def
+CFG1_OUT_LDFLAGS := $(CFG1_OUT_LDFLAGS)
+CFG_OBJS := $(CFG_OBJS)
+CFG2_OUT := $(CFG2_OUT)
 
 #
 #  依存関係の定義
 #
-cfg1_out.c: $(SRCDIR)/arch/$(PRC)_$(TOOL)/prc_def.csv
-kernel_cfg.timestamp: $(SRCDIR)/arch/$(PRC)_$(TOOL)/prc.tf
+cfg1_out.c: $(PRCDIR)/prc_sym.def
+kernel_cfg.timestamp: $(PRCDIR)/prc_kernel.trb
+check.timestamp: $(PRCDIR)/prc_check.trb
+
+#
+#  その他
+#
+CLEAN_FILES := $(CLEAN_FILES)
+REALCLEAN_FILES := $(REALCLEAN_FILES)

ssp_armv6_m_gcc/branches/rubycfg/armv6_m_gcc/prc_kernel.trb

@@ -8 +8 @@
 #   Copyright (C) 2015,2016 by Embedded and Real-Time Systems Laboratory
 #               Graduate School of Information Science, Nagoya Univ., JAPAN
-#   Copyright (C) 2017 by Naoki Saito
+#   Copyright (C) 2017-2020 by Naoki Saito
 #              Nagoya Municipal Industrial Research Institute, JAPAN
 #
@@ -45 +45 @@
 
 #
-#               パス2の生成スクリプトのコア依存部（ARM用）
+#               パス2の生成スクリプトのコア依存部（ARMv6-M用）
 #
 
@@ -57 +57 @@
 #  有効なCPU例外ハンドラ番号
 #
-$EXCNO_VALID = [ 2, 3, 4, 5, 6, 11, 12, 14 ]
+$EXCNO_VALID = [ 2, 3, 11, 14 ]
 
 #
@@ -92 +92 @@
 IncludeTrb("kernel/kernel.trb")
 
-$kernelCfgC.comment_header("Target-dependent Definitions (ARM-M)")
+$kernelCfgC.comment_header("Target-dependent Definitions (ARMv6-M)")
 
 #
@@ -107 +107 @@
 
 (2..14).each do |excno|
-  if excno == 11
-    $kernelCfgC.append("\t(FP)(kernel_svc_handler),      // 11 SVCall handler")
-  else
-    $kernelCfgC.append("\t(FP)(_kernel_exc_entry),")
-  end
+  $kernelCfgC.append("\t(FP)(_kernel_exc_entry),")
   $kernelCfgC.add(" /* #{excno} */")
 end

ssp_armv6_m_gcc/branches/rubycfg/build_ssp.sh

@@ -21 +21 @@
 SSP_DOWNLOAD_URL=https://www.toppers.jp/download.cgi/$SSP_PACKAGE
 SSP_RUBYCFG_FILES_URL=http://dev.toppers.jp/svn_user/contrib/rubycfg_ssp/trunk
-SSP_TARGET_NAME=qemu_virt_gcc
+SSP_TARGET_NAME=lpcxpresso_lpc812_gcc
 
 ASP3_DIR=$WORK_DIR/asp3

ssp_armv6_m_gcc/branches/rubycfg/install.sh

@@ -11 +11 @@
 fi
 
-cp -a ${SCRIPT_DIR}/arm64_gcc ${SSPDIR}/arch/
-cp -a ${SCRIPT_DIR}/qemu_virt_gcc ${SSPDIR}/target/
+cp -a ${SCRIPT_DIR}/armv6_m_gcc ${SSPDIR}/arch/
+cp -a ${SCRIPT_DIR}/lpcxpresso_lpc812_gcc ${SSPDIR}/target/
 
 exit 0

ssp_armv6_m_gcc/branches/rubycfg/lpcxpresso_lpc812_gcc/Makefile.target

@@ -13 +13 @@
 #  CMSIS を使うかどうか
 #
-
 USE_CMSIS = false
 CMSIS_INCLUDE_PATH = /Users/saito/Documents/LPCXpresso_5.2.4/workspace/CMSIS_CORE_LPC8xx/inc
@@ -21 +20 @@
 #  MTB(Micro Trace Buffer)を使うかどうか
 #
-
 USE_MTB = false
 MTB_BUF_SIZE = 64
@@ -31 +29 @@
 
 #
-#  各セグメントの開始アドレスの定義
+#  コンパイルオプション
 #
+COPTS := $(COPTS) -mcpu=cortex-m0 -mthumb
+CDEFS := $(CDEFS) -D__NEWLIB__
+INCLUDES := $(INCLUDES) -I$(TARGETDIR)
+LDFLAGS := $(LDFLAGS)
+LIBS := $(LIBS)
 
 #
-#  コンパイルオプション
+#  システムサービスに関する定義
 #
-INCLUDES := $(INCLUDES) -I$(TARGETDIR)
-CDEFS := $(CDEFS) -D__NEWLIB__
-COPTS := $(COPTS) -mcpu=cortex-m0 -mthumb
+SYSSVC_DIRS := $(SYSSVC_DIRS)
+SYSSVC_ASMOBJS := $(SYSSVC_ASMOBJS)
+SYSSVC_COBJS := $(SYSSVC_COBJS)
+SYSSVC_CFLAGS := $(SYSSVC_CFLAGS)
+SYSSVC_LIBS := $(SYSSVC_LIBS)
 
 #
 #  カーネルに関する定義
 #
-KERNEL_DIR := $(KERNEL_DIR) $(TARGETDIR)
-KERNEL_ASMOBJS := $(KERNEL_ASMOBJS) target_support.o 
+KERNEL_DIRS := $(KERNEL_DIRS) $(TARGETDIR)
+KERNEL_ASMOBJS := $(KERNEL_ASMOBJS) target_support.o
 KERNEL_COBJS := $(KERNEL_COBJS) target_config.o target_serial.o
 KERNEL_CFLAGS := $(KERNEL_CFLAGS) -fno-strict-aliasing
-
-#
-#  システムサービスに関する定義
-#
-SYSSVC_DIR := $(SYSSVC_DIR)
-SYSSVC_COBJS := $(SYSSVC_COBJS)
-SYSSVC_CFLAGS := $(SYSSVC_CFLAGS)
-
-#
-#  コンフィギュレータ関係の変数の定義
-#
-CFG_TABS := $(CFG_TABS) --cfg1-def-table $(TARGETDIR)/target_def.csv
 
 #
@@ -66 +59 @@
 ifeq ($(ENABLE_TRACE),true)
         COPTS := $(COPTS) -DTOPPERS_ENABLE_TRACE
-        KERNEL_DIR := $(KERNEL_DIR) $(SRCDIR)/arch/logtrace
+        KERNEL_DIRS := $(KERNEL_DIRS) $(SRCDIR)/arch/logtrace
         KERNEL_COBJS := $(KERNEL_COBJS) trace_config.o trace_dump.o
 endif
+
+#
+#  コンフィギュレータ関係の変数の定義
+#
+CFG_TABS := $(CFG_TABS) --symval-table $(TARGETDIR)/target_sym.def
+CFG1_OUT_LDFLAGS := $(CFG1_OUT_LDFLAGS)
+CFG_OBJS := $(CFG_OBJS)
+CFG2_OUT := $(CFG2_OUT)
+
+#
+#  -Wall オプションの省略
+#    -Wallを追加したくない場合に true に定義する
+#
+#OMIT_WARNING_ALL = true
+
+#
+#  最適化フラグの省略
+#    -O2を追加したくない場合に true に定義する
+#
+#OMIT_OPTIMIZATION = true
 
 #
@@ -99 +112 @@
 
 #
+#  各セクションの先頭番地の指定
+#
+#TEXT_START_ADDRESS =
+#DATA_START_ADDRESS =
+
+#
 #  スタートアップモジュールに関する定義
 #
+
+#  スタートアップモジュール
+START_OBJS =
 #  リンカスクリプトに「STARTUP(start.o)」を記述したため，スタートアップモジュー
 #  ルの名前をHIDDEN_OBJSに定義する．また，LDFLAGSに-nostdlibを追加している．
-#
 HIDDEN_OBJS = start.o
 
+# スタートアップモジュールのコンパイルルール
+$(START_OBJS): %.o: %.S
+        $(CC) -c $(CFLAGS) $(KERNEL_CFLAGS) $<
 $(HIDDEN_OBJS): %.o: %.S
         $(CC) -c $(CFLAGS) $(KERNEL_CFLAGS) $<
 
+
+# スタートアップモジュールの依存関係作成ルール
+$(START_OBJS:.o=.d): %.d: %.S
+        @$(PERL) $(SRCDIR)/utils/makedep -C $(CC) $(MAKEDEP_OPTS) \
+                -O "$(CFLAGS) $(KERNEL_CFLAGS)" $< >> Makefile.depend
 $(HIDDEN_OBJS:.o=.d): %.d: %.S
-        @$(PERL) $(SRCDIR)/utils/makedep -C $(CC) \
-                -O "$(CFLAGS) $(KERNEL_CFLAGS)" $< >> Makefile.depend
+        @$(PERL) $(SRCDIR)/utils/makedep -C $(CC) $(MAKEDEP_OPTS) \
+                -O "$(CFLAGS) $(KERNEL_CFLAGS)" $< >> Makefile.depend
 
 LDFLAGS := -nostdlib $(LDFLAGS) --entry=_start
@@ -118 +147 @@
 #  依存関係の定義
 #
-cfg1_out.c: $(TARGETDIR)/target_def.csv
-kernel_cfg.timestamp: $(TARGETDIR)/target.tf
-$(OBJFILE): $(TARGETDIR)/target_check.tf
+cfg1_out.c: $(TARGETDIR)/target_sym.def
+kernel_cfg.timestamp: $(TARGETDIR)/target_kernel.trb
+check.timestamp: $(TARGETDIR)/target_check.trb
+
+#
+#  その他
+#
+CLEAN_FILES := $(CLEAN_FILES)
+REALCLEAN_FILES := $(REALCLEAN_FILES)
+
 
 #

ssp_armv6_m_gcc/branches/rubycfg/setup_tools.sh

@@ -2 +2 @@
 set -eu
 
-# Variables
-GCC_COMMAND=aarch64-elf-gcc
-QEMU_COMMAND=qemu-system-aarch64
-GCC_PACKAGE_FILE=gcc-linaro-7.2.1-2017.11-x86_64_aarch64-elf.tar.xz
-GCC_DOWNLOAD_URL=https://releases.linaro.org/components/toolchain/binaries/7.2-2017.11/aarch64-elf/$GCC_PACKAGE_FILE
-
-if [ ! -v TOOLDIR ]; then
-  TOOLDIR=$HOME/MyTools
-fi
-
-GCC_INSTALL_DIR=$TOOLDIR/$GCC_COMMAND
-GCC_COMMAND_PATH=$GCC_INSTALL_DIR/bin/$GCC_COMMAND
-
-TMPDIR=/tmp
-
-: "install $GCC_COMMAND" && {
-  cd $TMPDIR
-
-  if type $GCC_COMMAND_PATH > /dev/null 2>&1; then 
-    echo "It seems $GCC_COMMAND exists in $GCC_COMMAND_PATH. skip install."
-  else
-    wget $GCC_DOWNLOAD_URL -O $GCC_PACKAGE_FILE
-    wget $GCC_DOWNLOAD_URL.asc -O $GCC_PACKAGE_FILE.asc
-    : "MD5 hash check" && {
-      if md5sum -c $GCC_PACKAGE_FILE.asc;then
-        mkdir -p $GCC_INSTALL_DIR
-        tar xvf $GCC_PACKAGE_FILE -C $GCC_INSTALL_DIR --strip-components 1
-        echo export PATH=\"$GCC_INSTALL_DIR/bin:'$PATH'\" >> ~/.profile
-      else
-        echo "MD5 hash check error. exit"
-        exit 1
-      fi
-    }
-  fi
-}
-
-: "install $QEMU_COMMAND" && {
-  if type $QEMU_COMMAND > /dev/null 2>&1; then
-    echo "$QEMU_COMMAND already exists. skip install."
-  else
-    sudo apt-get update
-    sudo apt-get install -y qemu-system-arm
-  fi
-}
+# nothing to do
 
 exit 0