diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig index b840dee49ea..b627438e843 100644 --- a/configs/ntosd-dm320/nettest/defconfig +++ b/configs/ntosd-dm320/nettest/defconfig @@ -163,9 +163,9 @@ CONFIG_ARCH_INTERRUPTSTACK=0 # Boot options # # CONFIG_BOOT_RUNFROMEXTSRAM is not set -CONFIG_BOOT_RUNFROMFLASH=y +# CONFIG_BOOT_RUNFROMFLASH is not set # CONFIG_BOOT_RUNFROMISRAM is not set -# CONFIG_BOOT_RUNFROMSDRAM is not set +CONFIG_BOOT_RUNFROMSDRAM=y # CONFIG_BOOT_COPYTORAM is not set # @@ -174,9 +174,6 @@ CONFIG_BOOT_RUNFROMFLASH=y CONFIG_RAM_START=0x01100000 CONFIG_RAM_VSTART=0x00000000 CONFIG_RAM_SIZE=33554432 -CONFIG_FLASH_START=0x0 -CONFIG_FLASH_VSTART=0x0 -CONFIG_FLASH_SIZE=0 # CONFIG_ARCH_HAVE_SDRAM is not set # @@ -224,6 +221,9 @@ CONFIG_PREALLOC_TIMERS=8 # # Tasks and Scheduling # +# CONFIG_INIT_NONE is not set +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="nettest_main" CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=0 diff --git a/configs/ntosd-dm320/nettest/setenv.sh b/configs/ntosd-dm320/nettest/setenv.sh index cfb438ce72c..4d8e2c36e08 100755 --- a/configs/ntosd-dm320/nettest/setenv.sh +++ b/configs/ntosd-dm320/nettest/setenv.sh @@ -50,13 +50,14 @@ fi # This is the Cygwin path to the location where I installed the CodeSourcery # toolchain under windows. You will also have to edit this if you install # the CodeSourcery toolchain in any other location -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # This is the Cygwin path to the location where I build the buildroot # toolchain. export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin" -# Add the path to the toolchain to the PATH varialble +# Add the path to the toolchain to the PATH variable export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig index 16dba4299a3..7c38143fbb2 100644 --- a/configs/ntosd-dm320/nsh/defconfig +++ b/configs/ntosd-dm320/nsh/defconfig @@ -163,9 +163,9 @@ CONFIG_ARCH_INTERRUPTSTACK=0 # Boot options # # CONFIG_BOOT_RUNFROMEXTSRAM is not set -CONFIG_BOOT_RUNFROMFLASH=y +# CONFIG_BOOT_RUNFROMFLASH is not set # CONFIG_BOOT_RUNFROMISRAM is not set -# CONFIG_BOOT_RUNFROMSDRAM is not set +CONFIG_BOOT_RUNFROMSDRAM=y # CONFIG_BOOT_COPYTORAM is not set # @@ -174,9 +174,6 @@ CONFIG_BOOT_RUNFROMFLASH=y CONFIG_RAM_START=0x01100000 CONFIG_RAM_VSTART=0x00000000 CONFIG_RAM_SIZE=33554432 -CONFIG_FLASH_START=0x0 -CONFIG_FLASH_VSTART=0x0 -CONFIG_FLASH_SIZE=0 # CONFIG_ARCH_HAVE_SDRAM is not set # @@ -190,7 +187,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320" # Common Board Options # CONFIG_ARCH_HAVE_LEDS=y -CONFIG_ARCH_LEDS=y +# CONFIG_ARCH_LEDS is not set CONFIG_NSH_MMCSDMINOR=0 CONFIG_NSH_MMCSDSLOTNO=0 @@ -226,6 +223,9 @@ CONFIG_PREALLOC_TIMERS=8 # # Tasks and Scheduling # +# CONFIG_INIT_NONE is not set +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=32 diff --git a/configs/ntosd-dm320/nsh/setenv.sh b/configs/ntosd-dm320/nsh/setenv.sh index 005aa815305..e44839b96c7 100755 --- a/configs/ntosd-dm320/nsh/setenv.sh +++ b/configs/ntosd-dm320/nsh/setenv.sh @@ -50,13 +50,14 @@ fi # This is the Cygwin path to the location where I installed the CodeSourcery # toolchain under windows. You will also have to edit this if you install # the CodeSourcery toolchain in any other location -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # This is the Cygwin path to the location where I build the buildroot # toolchain. export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin" -# Add the path to the toolchain to the PATH varialble +# Add the path to the toolchain to the PATH variable export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig index 35507ba61ed..541ef207017 100644 --- a/configs/ntosd-dm320/poll/defconfig +++ b/configs/ntosd-dm320/poll/defconfig @@ -163,9 +163,9 @@ CONFIG_ARCH_INTERRUPTSTACK=0 # Boot options # # CONFIG_BOOT_RUNFROMEXTSRAM is not set -CONFIG_BOOT_RUNFROMFLASH=y +# CONFIG_BOOT_RUNFROMFLASH is not set # CONFIG_BOOT_RUNFROMISRAM is not set -# CONFIG_BOOT_RUNFROMSDRAM is not set +CONFIG_BOOT_RUNFROMSDRAM=y # CONFIG_BOOT_COPYTORAM is not set # @@ -174,9 +174,6 @@ CONFIG_BOOT_RUNFROMFLASH=y CONFIG_RAM_START=0x01100000 CONFIG_RAM_VSTART=0x00000000 CONFIG_RAM_SIZE=33554432 -CONFIG_FLASH_START=0x0 -CONFIG_FLASH_VSTART=0x0 -CONFIG_FLASH_SIZE=0 # CONFIG_ARCH_HAVE_SDRAM is not set # @@ -190,7 +187,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320" # Common Board Options # CONFIG_ARCH_HAVE_LEDS=y -CONFIG_ARCH_LEDS=y +# CONFIG_ARCH_LEDS is not set # # Board-Specific Options @@ -224,6 +221,9 @@ CONFIG_PREALLOC_TIMERS=8 # # Tasks and Scheduling # +# CONFIG_INIT_NONE is not set +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="poll_main" CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=0 diff --git a/configs/ntosd-dm320/poll/setenv.sh b/configs/ntosd-dm320/poll/setenv.sh index 427ffe26ab9..d1125e80ea9 100755 --- a/configs/ntosd-dm320/poll/setenv.sh +++ b/configs/ntosd-dm320/poll/setenv.sh @@ -50,13 +50,14 @@ fi # This is the Cygwin path to the location where I installed the CodeSourcery # toolchain under windows. You will also have to edit this if you install # the CodeSourcery toolchain in any other location -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # This is the Cygwin path to the location where I build the buildroot # toolchain. export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin" -# Add the path to the toolchain to the PATH varialble +# Add the path to the toolchain to the PATH variable export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" diff --git a/configs/ntosd-dm320/src/Makefile b/configs/ntosd-dm320/src/Makefile index f361628e5d1..7c7a7f23dd7 100644 --- a/configs/ntosd-dm320/src/Makefile +++ b/configs/ntosd-dm320/src/Makefile @@ -35,18 +35,26 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -I$(TOPDIR)/sched +CFLAGS += -I$(TOPDIR)/sched -ASRCS = -AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = up_leds.c up_network.c -COBJS = $(CSRCS:.c=$(OBJEXT)) +ASRCS = +AOBJS = $(ASRCS:.S=$(OBJEXT)) +CSRCS = up_leds.c up_network.c +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) -ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src -CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm +ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src +ifeq ($(WINTOOL),y) + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/arm}" +else + CFLAGS += -I$(ARCH_SRCDIR)/chip + CFLAGS += -I$(ARCH_SRCDIR)/common + CFLAGS += -I$(ARCH_SRCDIR)/arm +endif all: libboard$(LIBEXT) diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig index a3325b13284..2e18e9a8002 100644 --- a/configs/ntosd-dm320/thttpd/defconfig +++ b/configs/ntosd-dm320/thttpd/defconfig @@ -163,9 +163,9 @@ CONFIG_ARCH_INTERRUPTSTACK=0 # Boot options # # CONFIG_BOOT_RUNFROMEXTSRAM is not set -CONFIG_BOOT_RUNFROMFLASH=y +# CONFIG_BOOT_RUNFROMFLASH is not set # CONFIG_BOOT_RUNFROMISRAM is not set -# CONFIG_BOOT_RUNFROMSDRAM is not set +CONFIG_BOOT_RUNFROMSDRAM=y # CONFIG_BOOT_COPYTORAM is not set # @@ -174,9 +174,6 @@ CONFIG_BOOT_RUNFROMFLASH=y CONFIG_RAM_START=0x01100000 CONFIG_RAM_VSTART=0x00000000 CONFIG_RAM_SIZE=33554432 -CONFIG_FLASH_START=0x0 -CONFIG_FLASH_VSTART=0x0 -CONFIG_FLASH_SIZE=0 # CONFIG_ARCH_HAVE_SDRAM is not set # @@ -190,7 +187,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320" # Common Board Options # CONFIG_ARCH_HAVE_LEDS=y -CONFIG_ARCH_LEDS=y +# CONFIG_ARCH_LEDS is not set # # Board-Specific Options @@ -224,6 +221,9 @@ CONFIG_PREALLOC_TIMERS=8 # # Tasks and Scheduling # +# CONFIG_INIT_NONE is not set +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="thttp_main" CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=0 diff --git a/configs/ntosd-dm320/thttpd/setenv.sh b/configs/ntosd-dm320/thttpd/setenv.sh index ea38c09a51a..cefb299efbe 100755 --- a/configs/ntosd-dm320/thttpd/setenv.sh +++ b/configs/ntosd-dm320/thttpd/setenv.sh @@ -50,13 +50,14 @@ fi # This is the Cygwin path to the location where I installed the CodeSourcery # toolchain under windows. You will also have to edit this if you install # the CodeSourcery toolchain in any other location -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # This is the Cygwin path to the location where I build the buildroot # toolchain. export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin" -# Add the path to the toolchain to the PATH varialble +# Add the path to the toolchain to the PATH variable export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig index 69d0159b2a7..26aac72118a 100644 --- a/configs/ntosd-dm320/udp/defconfig +++ b/configs/ntosd-dm320/udp/defconfig @@ -163,9 +163,9 @@ CONFIG_ARCH_INTERRUPTSTACK=0 # Boot options # # CONFIG_BOOT_RUNFROMEXTSRAM is not set -CONFIG_BOOT_RUNFROMFLASH=y +# CONFIG_BOOT_RUNFROMFLASH is not set # CONFIG_BOOT_RUNFROMISRAM is not set -# CONFIG_BOOT_RUNFROMSDRAM is not set +CONFIG_BOOT_RUNFROMSDRAM=y # CONFIG_BOOT_COPYTORAM is not set # @@ -174,9 +174,6 @@ CONFIG_BOOT_RUNFROMFLASH=y CONFIG_RAM_START=0x01100000 CONFIG_RAM_VSTART=0x00000000 CONFIG_RAM_SIZE=33554432 -CONFIG_FLASH_START=0x0 -CONFIG_FLASH_VSTART=0x0 -CONFIG_FLASH_SIZE=0 # CONFIG_ARCH_HAVE_SDRAM is not set # @@ -190,7 +187,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320" # Common Board Options # CONFIG_ARCH_HAVE_LEDS=y -CONFIG_ARCH_LEDS=y +# CONFIG_ARCH_LEDS is not set # # Board-Specific Options @@ -224,6 +221,7 @@ CONFIG_PREALLOC_TIMERS=8 # # Tasks and Scheduling # +# CONFIG_INIT_NONE is not set CONFIG_INIT_ENTRYPOINT=y # CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="udp_main" diff --git a/configs/ntosd-dm320/udp/setenv.sh b/configs/ntosd-dm320/udp/setenv.sh index 92995bee566..9af3c4dc6a6 100755 --- a/configs/ntosd-dm320/udp/setenv.sh +++ b/configs/ntosd-dm320/udp/setenv.sh @@ -50,13 +50,14 @@ fi # This is the Cygwin path to the location where I installed the CodeSourcery # toolchain under windows. You will also have to edit this if you install # the CodeSourcery toolchain in any other location -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # This is the Cygwin path to the location where I build the buildroot # toolchain. export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin" -# Add the path to the toolchain to the PATH varialble +# Add the path to the toolchain to the PATH variable export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" diff --git a/configs/ntosd-dm320/webserver/defconfig b/configs/ntosd-dm320/webserver/defconfig index 5bc5fc09884..fd20478ff7f 100644 --- a/configs/ntosd-dm320/webserver/defconfig +++ b/configs/ntosd-dm320/webserver/defconfig @@ -163,9 +163,9 @@ CONFIG_ARCH_INTERRUPTSTACK=0 # Boot options # # CONFIG_BOOT_RUNFROMEXTSRAM is not set -CONFIG_BOOT_RUNFROMFLASH=y +# CONFIG_BOOT_RUNFROMFLASH is not set # CONFIG_BOOT_RUNFROMISRAM is not set -# CONFIG_BOOT_RUNFROMSDRAM is not set +CONFIG_BOOT_RUNFROMSDRAM=y # CONFIG_BOOT_COPYTORAM is not set # @@ -174,9 +174,6 @@ CONFIG_BOOT_RUNFROMFLASH=y CONFIG_RAM_START=0x01100000 CONFIG_RAM_VSTART=0x00000000 CONFIG_RAM_SIZE=33554432 -CONFIG_FLASH_START=0x0 -CONFIG_FLASH_VSTART=0x0 -CONFIG_FLASH_SIZE=0 # CONFIG_ARCH_HAVE_SDRAM is not set # @@ -190,7 +187,7 @@ CONFIG_ARCH_BOARD="ntosd-dm320" # Common Board Options # CONFIG_ARCH_HAVE_LEDS=y -CONFIG_ARCH_LEDS=y +# CONFIG_ARCH_LEDS is not set # # Board-Specific Options @@ -224,6 +221,9 @@ CONFIG_PREALLOC_TIMERS=8 # # Tasks and Scheduling # +# CONFIG_INIT_NONE is not set +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="webserver_main" CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=0 diff --git a/configs/ntosd-dm320/webserver/setenv.sh b/configs/ntosd-dm320/webserver/setenv.sh index 438c34c4d3c..11a5c8c8749 100755 --- a/configs/ntosd-dm320/webserver/setenv.sh +++ b/configs/ntosd-dm320/webserver/setenv.sh @@ -50,13 +50,14 @@ fi # This is the Cygwin path to the location where I installed the CodeSourcery # toolchain under windows. You will also have to edit this if you install # the CodeSourcery toolchain in any other location -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # This is the Cygwin path to the location where I build the buildroot # toolchain. export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin" -# Add the path to the toolchain to the PATH varialble +# Add the path to the toolchain to the PATH variable export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" diff --git a/configs/sama5d4-ek/elf/setenv.sh b/configs/sama5d4-ek/elf/setenv.sh index c7a2c45a714..686f106c9ae 100755 --- a/configs/sama5d4-ek/elf/setenv.sh +++ b/configs/sama5d4-ek/elf/setenv.sh @@ -71,7 +71,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code # toolchain. #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin" -# Add the path to the toolchain to the PATH varialble +# Add the path to the toolchain to the PATH variable export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}"