diff options
| -rw-r--r-- | apps/examples/udp/Makefile | 6 | ||||
| -rw-r--r-- | nuttx/configs/ntosd-dm320/udp/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/sam4e-ek/nsh/defconfig | 12 |
3 files changed, 15 insertions, 5 deletions
diff --git a/apps/examples/udp/Makefile b/apps/examples/udp/Makefile index 360cfd8c2..7d0426026 100644 --- a/apps/examples/udp/Makefile +++ b/apps/examples/udp/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examples/udp/Makefile # -# Copyright (C) 2007-2008, 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2011-2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -53,7 +53,7 @@ TARG_AOBJS = $(TARG_ASRCS:.S=$(OBJEXT)) TARG_COBJS = $(TARG_CSRCS:.c=$(OBJEXT)) TARG_MAINOBJ = $(TARG_MAINSRC:.c=$(OBJEXT)) -TARG_SRCS = $(TARG_ASRCS) $(TARG_CSRCS) $(TARG_CSRCS) +TARG_SRCS = $(TARG_ASRCS) $(TARG_CSRCS) $(TARG_MAINSRC) TARG_OBJS = $(TARG_AOBJS) $(TARG_COBJS) ifneq ($(CONFIG_BUILD_KERNEL),y) @@ -110,7 +110,7 @@ $(TARG_AOBJS): %$(OBJEXT): %.S $(TARG_COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) -"$(TARG_BIN)": $(TARG_OBJS) $(HOST_BIN) +$(TARG_BIN): $(TARG_OBJS) $(HOST_BIN) $(call ARCHIVE, $@, $(TARG_OBJS)) $(HOST_OBJS): %.o: %.c diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig index 066c20159..69d0159b2 100644 --- a/nuttx/configs/ntosd-dm320/udp/defconfig +++ b/nuttx/configs/ntosd-dm320/udp/defconfig @@ -224,6 +224,8 @@ CONFIG_PREALLOC_TIMERS=8 # # Tasks and Scheduling # +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="udp_main" CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=0 diff --git a/nuttx/configs/sam4e-ek/nsh/defconfig b/nuttx/configs/sam4e-ek/nsh/defconfig index 0cd000415..40d9f869d 100644 --- a/nuttx/configs/sam4e-ek/nsh/defconfig +++ b/nuttx/configs/sam4e-ek/nsh/defconfig @@ -17,6 +17,7 @@ CONFIG_HOST_LINUX=y # Build Configuration # # CONFIG_APPS_DIR="../apps" +CONFIG_BUILD_FLAT=y # CONFIG_BUILD_2PASS is not set # @@ -99,7 +100,6 @@ CONFIG_ARCH_FAMILY="armv7-m" CONFIG_ARCH_CHIP="sam34" # CONFIG_ARMV7M_USEBASEPRI is not set # CONFIG_ARCH_HAVE_FPU is not set -CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARMV7M_MPU is not set # @@ -258,11 +258,15 @@ CONFIG_SAM34_EMAC_ISETH0=y CONFIG_ARCH_DMA=y CONFIG_ARCH_HAVE_IRQPRIO=y # CONFIG_ARCH_L2CACHE is not set -# CONFIG_ARCH_ADDRENV is not set +# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set +# CONFIG_ARCH_HAVE_ADDRENV is not set +# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set CONFIG_ARCH_HAVE_VFORK=y # CONFIG_ARCH_HAVE_MMU is not set +CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARCH_NAND_HWECC is not set # CONFIG_ARCH_HAVE_EXTCLK is not set +# CONFIG_ARCH_USE_MPU is not set # CONFIG_ARCH_IRQPRIO is not set CONFIG_ARCH_STACKDUMP=y # CONFIG_ENDIAN_BIG is not set @@ -356,6 +360,8 @@ CONFIG_PREALLOC_TIMERS=4 # # Tasks and Scheduling # +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=0 @@ -417,6 +423,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024 CONFIG_USERMAIN_STACKSIZE=2048 CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_DEFAULT=2048 +# CONFIG_LIB_SYSCALL is not set # # Device Drivers @@ -661,6 +668,7 @@ CONFIG_NET_ARP=y CONFIG_NET_ARPTAB_SIZE=16 CONFIG_NET_ARP_MAXAGE=120 # CONFIG_NET_ARP_IPIN is not set +# CONFIG_NET_ARP_SEND is not set # # Network I/O Buffer Support |