diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2015-03-31 12:14:16 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2015-03-31 12:14:16 -0600 |
commit | 50cbc253bcd8a77ebcbd225855f3b2ccb31f6c21 (patch) | |
tree | d294f42bc878ea47a5787a8cab0ac96480407a55 /nuttx/configs/sam4e-ek | |
parent | 73a89efed06a03f2733c14e42553ad23223f5cad (diff) | |
download | px4-nuttx-50cbc253bcd8a77ebcbd225855f3b2ccb31f6c21.tar.gz px4-nuttx-50cbc253bcd8a77ebcbd225855f3b2ccb31f6c21.tar.bz2 px4-nuttx-50cbc253bcd8a77ebcbd225855f3b2ccb31f6c21.zip |
NSH initialization now calls boardctl(BOARDIOC_INIT) instead of board_app_initaliaze. Modify all configurations: Make sure that CONFIG_LIB_BOARDCTL=y appears wherever CONFIG_NSH_ARCHINIT=y appears. Remove support for CONFIG_NSH_ARCHMAC. It is not used and there are better ways to do that operation
Diffstat (limited to 'nuttx/configs/sam4e-ek')
-rw-r--r-- | nuttx/configs/sam4e-ek/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/sam4e-ek/nxwm/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/sam4e-ek/usbnsh/defconfig | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/configs/sam4e-ek/nsh/defconfig b/nuttx/configs/sam4e-ek/nsh/defconfig index 2aaeb8476..45daac75c 100644 --- a/nuttx/configs/sam4e-ek/nsh/defconfig +++ b/nuttx/configs/sam4e-ek/nsh/defconfig @@ -1050,6 +1050,7 @@ CONFIG_NSH_FILEIOSIZE=512 # CONFIG_NSH_CONSOLE=y CONFIG_NSH_ARCHINIT=y +CONFIG_LIB_BOARDCTL=y # # Networking Configuration @@ -1069,7 +1070,6 @@ CONFIG_NSH_NETMASK=0xffffff00 # CONFIG_NSH_DNS is not set CONFIG_NSH_NOMAC=y CONFIG_NSH_SWMAC=y -# CONFIG_NSH_ARCHMAC is not set CONFIG_NSH_MACADDR=0x00e0deadbeef CONFIG_NSH_MAX_ROUNDTRIP=20 diff --git a/nuttx/configs/sam4e-ek/nxwm/defconfig b/nuttx/configs/sam4e-ek/nxwm/defconfig index 484a22ac1..58d381abc 100644 --- a/nuttx/configs/sam4e-ek/nxwm/defconfig +++ b/nuttx/configs/sam4e-ek/nxwm/defconfig @@ -1156,6 +1156,7 @@ CONFIG_NSH_FILEIOSIZE=512 # CONFIG_NSH_CONSOLE=y CONFIG_NSH_ARCHINIT=y +CONFIG_LIB_BOARDCTL=y # # Networking Configuration @@ -1167,7 +1168,6 @@ CONFIG_NSH_NETMASK=0xffffff00 # CONFIG_NSH_DNS is not set CONFIG_NSH_NOMAC=y CONFIG_NSH_SWMAC=y -# CONFIG_NSH_ARCHMAC is not set CONFIG_NSH_MACADDR=0x00e0deadbeef CONFIG_NSH_MAX_ROUNDTRIP=20 diff --git a/nuttx/configs/sam4e-ek/usbnsh/defconfig b/nuttx/configs/sam4e-ek/usbnsh/defconfig index 989f1cc6d..080de5156 100644 --- a/nuttx/configs/sam4e-ek/usbnsh/defconfig +++ b/nuttx/configs/sam4e-ek/usbnsh/defconfig @@ -1049,6 +1049,7 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_CONSOLE=y # CONFIG_NSH_USBCONSOLE is not set CONFIG_NSH_ARCHINIT=y +CONFIG_LIB_BOARDCTL=y # # Networking Configuration @@ -1060,7 +1061,6 @@ CONFIG_NSH_NETMASK=0xffffff00 # CONFIG_NSH_DNS is not set CONFIG_NSH_NOMAC=y CONFIG_NSH_SWMAC=y -# CONFIG_NSH_ARCHMAC is not set CONFIG_NSH_MACADDR=0x00e0deadbeef CONFIG_NSH_MAX_ROUNDTRIP=20 |