ixp4xx/apex: Update to Apex 1.5.14, and add support for the Freecom FSG-3

SVN-Revision: 13423
16 years ago · ed172748e1
parent 570f4128cd
commit ed172748e1
6 changed files with 41 additions and 358 deletions
--- a/target/linux/ixp4xx/image/apex/Makefile
+++ b/target/linux/ixp4xx/image/apex/Makefile
@ -9,14 +9,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=apex
-PKG_VERSION:=1.5.13
+PKG_VERSION:=1.5.14
 PKG_RELEASE:=1

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.buici.com/pub/apex/ \
 	ftp://metalab.unc.edu/pub/Linux/system/boot/apex/
-PKG_MD5SUM:=5feb7a05431e5e8a4aa36fb23347de8e
+PKG_MD5SUM:=22fb46e76c8221c7bcc9734602367460

 include $(INCLUDE_DIR)/package.mk
 export GCC_HONOUR_COPTS=s
@ -47,6 +47,16 @@ define Build/Compile
 		ARCH=arm \
 		all
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/apex.bin $(TARGET)/apex-nslu2-16mb-armeb.bin
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		ARCH=arm \
+		slugos-fsg3-armeb_config
+	$(SED) 's,.*CONFIG_AEABI.*,$(if $(CONFIG_EABI_SUPPORT),CONFIG_AEABI=y,# CONFIG_AEABI is not set),' $(PKG_BUILD_DIR)/.config
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		KBUILD_HAVE_NLS=no \
+		ARCH=arm \
+		all
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/apex.bin $(TARGET)/apex-fsg3-armeb.bin
 endef

 define Build/InstallDev
--- a/target/linux/ixp4xx/image/apex/patches/100-openwrt_nslu2_armeb_config.patch
+++ b/target/linux/ixp4xx/image/apex/patches/100-openwrt_nslu2_armeb_config.patch
@ -7,14 +7,15 @@
 -CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2 (bigendian)"
 +CONFIG_TARGET_DESCRIPTION="OpenWRT NSLU2 (8MiB Flash)"
 CONFIG_CROSS_COMPILE=""
+ CONFIG_AEABI=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
- # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
@@ -143,7 +143,7 @@
 #    Overrides
 #
 CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
 -CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
 +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
+ CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y
+-CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
 # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
- CONFIG_USES_NOR_BOOTFLASH=y
- CONFIG_RELOCATE_SIMPLE=y
--- a/target/linux/ixp4xx/image/apex/patches/110-slugos_nslu2_16mb.patch
+++ b/target/linux/ixp4xx/image/apex/patches/110-slugos_nslu2_16mb.patch
@ -1,322 +0,0 @@
-Index: apex-1.5.13/src/mach-ixp42x/slugos-nslu2-16mb-arm_config
-===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ apex-1.5.13/src/mach-ixp42x/slugos-nslu2-16mb-arm_config	2007-12-17 22:08:11.000000000 +1030
-@@ -0,0 +1,156 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 
-+# Mon Jun 25 16:41:57 2007
-+#
-+CONFIG_ARM=y
-+CONFIG_CPU_ARMV5=y
-+CONFIG_CPU_XSCALE=y
-+# CONFIG_ARCH_LH7952X is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+CONFIG_ARCH_IXP42X=y
-+# CONFIG_ARCH_S3C2410 is not set
-+# CONFIG_ARCH_MX3 is not set
-+CONFIG_EXPERIMENTAL=y
-+# CONFIG_SMALL is not set
-+
-+#
-+# General Setup
-+#
-+CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/LE (16MiB Flash)"
-+CONFIG_CROSS_COMPILE=""
-+# CONFIG_AEABI is not set
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
-+# CONFIG_CC_NO_OPTIMIZATION is not set
-+CONFIG_STARTUP_UART=y
-+# CONFIG_DEBUG_LL is not set
-+CONFIG_SPINNER=y
-+CONFIG_ATAG=y
-+CONFIG_MMU=y
-+# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set
-+CONFIG_DISABLE_MMU_AT_BOOT=y
-+# CONFIG_INTERRUPTS is not set
-+CONFIG_SDRAMBOOT_REPORT=y
-+CONFIG_STACK_SIZE=0x1000
-+CONFIG_STACKLIMIT=y
-+# CONFIG_BOOTSTRAP_MEMTEST is not set
-+CONFIG_ATAG_PHYS=0x00000100
-+CONFIG_ARCH_NUMBER=597
-+CONFIG_APEX_VMA=0x00200000
-+CONFIG_KERNEL_LMA=0x00008000
-+# CONFIG_USE_RAMDISK is not set
-+CONFIG_SDRAM_BANK0=y
-+# CONFIG_SDRAM_BANK1 is not set
-+CONFIG_NOR_BUSWIDTH=16
-+CONFIG_NOR_BANK0=y
-+CONFIG_NOR_BANK0_START=0x50000000
-+CONFIG_NOR_BANK0_LENGTH=0x01000000
-+CONFIG_MACH="ixp42x"
-+CONFIG_MACH_NSLU2=y
-+# CONFIG_MACH_NAS100D is not set
-+# CONFIG_MACH_DSMG600 is not set
-+# CONFIG_MACH_AVILA2347 is not set
-+# CONFIG_USER_DEFAULTENDIAN is not set
-+# CONFIG_USER_BIGENDIAN is not set
-+CONFIG_USER_LITTLEENDIAN=y
-+
-+#
-+# Platform Setup
-+#
-+CONFIG_SDRAM_BANK_LENGTH=0x02000000
-+# CONFIG_DISABLE_SECOND_UART_INIT is not set
-+CONFIG_ARCH_IXP420=y
-+
-+#
-+# Commands
-+#
-+CONFIG_ALLHELP=y
-+CONFIG_ALPHABETIZE_COMMANDS=y
-+CONFIG_DEL_IS_BS=y
-+CONFIG_ANSI_KEYS=y
-+CONFIG_COMMAND_HISTORY=y
-+CONFIG_COMMAND_EDITING=y
-+# CONFIG_TIME_COMMANDS is not set
-+CONFIG_CMD_ALIAS=y
-+CONFIG_CMD_CHECKSUM=y
-+CONFIG_CMD_COPY=y
-+CONFIG_CMD_COMPARE=y
-+CONFIG_CMD_DRVINFO=y
-+CONFIG_CMD_DUMP=y
-+CONFIG_CMD_ENV=y
-+CONFIG_CMD_SETENV=y
-+CONFIG_CMD_ERASE=y
-+CONFIG_CMD_FILL=y
-+CONFIG_CMD_GO=y
-+CONFIG_CMD_INFO=y
-+# CONFIG_CMD_PAUSE is not set
-+CONFIG_CMD_WAIT=y
-+CONFIG_CMD_XRECEIVE=y
-+CONFIG_CMD_MEMLIMIT=y
-+CONFIG_CMD_MEMSCAN=y
-+CONFIG_CMD_MEMTEST=y
-+
-+#
-+# Generic Drivers
-+#
-+# CONFIG_DRIVER_FAT is not set
-+# CONFIG_DRIVER_EXT2 is not set
-+# CONFIG_DRIVER_JFFS2 is not set
-+CONFIG_DRIVER_FIS=y
-+CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0xfe0000+4k"
-+CONFIG_DRIVER_NOR_CFI=y
-+# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set
-+# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set
-+CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y
-+# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set
-+# CONFIG_DRIVER_ONENAND is not set
-+# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set
-+CONFIG_USES_NOR_CFI=y
-+CONFIG_USES_PATHNAME_PARSER=y
-+CONFIG_USES_IXP4XX_NPE_ETH=y
-+
-+#
-+# Environment
-+#
-+CONFIG_ENV=y
-+CONFIG_ENV_LINK=y
-+CONFIG_ENV_MUTABLE=y
-+CONFIG_ENV_REGION="nor:0x7c000+16k"
-+# CONFIG_ENV_SAVEATONCE is not set
-+CONFIG_ENV_CHECK_LEN=1024
-+# CONFIG_VARIATIONS is not set
-+# CONFIG_NO_BOOTSTRAP is not set
-+CONFIG_NOR_BOOT=y
-+# CONFIG_NAND_BOOT is not set
-+# CONFIG_ONENAND_BOOT is not set
-+# CONFIG_COMPANION_EVT1_BOOT is not set
-+# CONFIG_COMPANION_EVT2_BOOT is not set
-+
-+#
-+#    Default Startup
-+#
-+CONFIG_AUTOBOOT=y
-+CONFIG_AUTOBOOT_DELAY=10
-+CONFIG_ENV_STARTUP_KERNEL_COPY=y
-+CONFIG_ENV_REGION_KERNEL_SWAP=y
-+# CONFIG_ENV_STARTUP_PREFIX_P is not set
-+
-+#
-+#    Regions
-+#
-+CONFIG_ENV_REGION_KERNEL="fis://kernel"
-+
-+#
-+#    Overrides
-+#
-+CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
-+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
-+# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
-+CONFIG_USES_NOR_BOOTFLASH=y
-+CONFIG_RELOCATE_SIMPLE=y
-+CONFIG_INLINE_PLATFORM_INITIALIZATION=y
-+CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y
-+CONFIG_LITTLEENDIAN=y
-+CONFIG_CLEAR_STACKS=y
-+CONFIG_ALIASES=y
-Index: apex-1.5.13/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config
-===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ apex-1.5.13/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config	2007-12-17 22:08:24.000000000 +1030
-@@ -0,0 +1,156 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 
-+# Mon Jun 25 16:41:57 2007
-+#
-+CONFIG_ARM=y
-+CONFIG_CPU_ARMV5=y
-+CONFIG_CPU_XSCALE=y
-+# CONFIG_ARCH_LH7952X is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+CONFIG_ARCH_IXP42X=y
-+# CONFIG_ARCH_S3C2410 is not set
-+# CONFIG_ARCH_MX3 is not set
-+CONFIG_EXPERIMENTAL=y
-+# CONFIG_SMALL is not set
-+
-+#
-+# General Setup
-+#
-+CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/BE (16MiB Flash)"
-+CONFIG_CROSS_COMPILE=""
-+# CONFIG_AEABI is not set
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
-+# CONFIG_CC_NO_OPTIMIZATION is not set
-+CONFIG_STARTUP_UART=y
-+# CONFIG_DEBUG_LL is not set
-+CONFIG_SPINNER=y
-+CONFIG_ATAG=y
-+CONFIG_MMU=y
-+# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set
-+CONFIG_DISABLE_MMU_AT_BOOT=y
-+# CONFIG_INTERRUPTS is not set
-+CONFIG_SDRAMBOOT_REPORT=y
-+CONFIG_STACK_SIZE=0x1000
-+CONFIG_STACKLIMIT=y
-+# CONFIG_BOOTSTRAP_MEMTEST is not set
-+CONFIG_ATAG_PHYS=0x00000100
-+CONFIG_ARCH_NUMBER=597
-+CONFIG_APEX_VMA=0x00200000
-+CONFIG_KERNEL_LMA=0x00008000
-+# CONFIG_USE_RAMDISK is not set
-+CONFIG_SDRAM_BANK0=y
-+# CONFIG_SDRAM_BANK1 is not set
-+CONFIG_NOR_BUSWIDTH=16
-+CONFIG_NOR_BANK0=y
-+CONFIG_NOR_BANK0_START=0x50000000
-+CONFIG_NOR_BANK0_LENGTH=0x01000000
-+CONFIG_MACH="ixp42x"
-+CONFIG_MACH_NSLU2=y
-+# CONFIG_MACH_NAS100D is not set
-+# CONFIG_MACH_DSMG600 is not set
-+# CONFIG_MACH_AVILA2347 is not set
-+# CONFIG_USER_DEFAULTENDIAN is not set
-+CONFIG_USER_BIGENDIAN=y
-+# CONFIG_USER_LITTLEENDIAN is not set
-+
-+#
-+# Platform Setup
-+#
-+CONFIG_SDRAM_BANK_LENGTH=0x02000000
-+# CONFIG_DISABLE_SECOND_UART_INIT is not set
-+CONFIG_ARCH_IXP420=y
-+
-+#
-+# Commands
-+#
-+CONFIG_ALLHELP=y
-+CONFIG_ALPHABETIZE_COMMANDS=y
-+CONFIG_DEL_IS_BS=y
-+CONFIG_ANSI_KEYS=y
-+CONFIG_COMMAND_HISTORY=y
-+CONFIG_COMMAND_EDITING=y
-+# CONFIG_TIME_COMMANDS is not set
-+CONFIG_CMD_ALIAS=y
-+CONFIG_CMD_CHECKSUM=y
-+CONFIG_CMD_COPY=y
-+CONFIG_CMD_COMPARE=y
-+CONFIG_CMD_DRVINFO=y
-+CONFIG_CMD_DUMP=y
-+CONFIG_CMD_ENV=y
-+CONFIG_CMD_SETENV=y
-+CONFIG_CMD_ERASE=y
-+CONFIG_CMD_FILL=y
-+CONFIG_CMD_GO=y
-+CONFIG_CMD_INFO=y
-+# CONFIG_CMD_PAUSE is not set
-+CONFIG_CMD_WAIT=y
-+CONFIG_CMD_XRECEIVE=y
-+CONFIG_CMD_MEMLIMIT=y
-+CONFIG_CMD_MEMSCAN=y
-+CONFIG_CMD_MEMTEST=y
-+
-+#
-+# Generic Drivers
-+#
-+# CONFIG_DRIVER_FAT is not set
-+# CONFIG_DRIVER_EXT2 is not set
-+# CONFIG_DRIVER_JFFS2 is not set
-+CONFIG_DRIVER_FIS=y
-+CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0xfe0000+4k"
-+CONFIG_DRIVER_NOR_CFI=y
-+# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set
-+# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set
-+CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y
-+# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set
-+# CONFIG_DRIVER_ONENAND is not set
-+# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set
-+CONFIG_USES_NOR_CFI=y
-+CONFIG_USES_PATHNAME_PARSER=y
-+CONFIG_USES_IXP4XX_NPE_ETH=y
-+
-+#
-+# Environment
-+#
-+CONFIG_ENV=y
-+CONFIG_ENV_LINK=y
-+CONFIG_ENV_MUTABLE=y
-+CONFIG_ENV_REGION="nor:0x7c000+16k"
-+# CONFIG_ENV_SAVEATONCE is not set
-+CONFIG_ENV_CHECK_LEN=1024
-+# CONFIG_VARIATIONS is not set
-+# CONFIG_NO_BOOTSTRAP is not set
-+CONFIG_NOR_BOOT=y
-+# CONFIG_NAND_BOOT is not set
-+# CONFIG_ONENAND_BOOT is not set
-+# CONFIG_COMPANION_EVT1_BOOT is not set
-+# CONFIG_COMPANION_EVT2_BOOT is not set
-+
-+#
-+#    Default Startup
-+#
-+CONFIG_AUTOBOOT=y
-+CONFIG_AUTOBOOT_DELAY=10
-+CONFIG_ENV_STARTUP_KERNEL_COPY=y
-+# CONFIG_ENV_REGION_KERNEL_SWAP is not set
-+# CONFIG_ENV_STARTUP_PREFIX_P is not set
-+
-+#
-+#    Regions
-+#
-+CONFIG_ENV_REGION_KERNEL="fis://kernel"
-+
-+#
-+#    Overrides
-+#
-+CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
-+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
-+# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
-+CONFIG_USES_NOR_BOOTFLASH=y
-+CONFIG_RELOCATE_SIMPLE=y
-+CONFIG_INLINE_PLATFORM_INITIALIZATION=y
-+CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y
-+CONFIG_BIGENDIAN=y
-+CONFIG_CLEAR_STACKS=y
-+CONFIG_ALIASES=y
--- a/target/linux/ixp4xx/image/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
+++ b/target/linux/ixp4xx/image/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
@ -7,14 +7,15 @@
 -CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/BE (16MiB Flash)"
 +CONFIG_TARGET_DESCRIPTION="OpenWRT NSLU2 (16MiB Flash)"
 CONFIG_CROSS_COMPILE=""
+ CONFIG_AEABI=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
- # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
@@ -143,7 +143,7 @@
 #    Overrides
 #
 CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
 -CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
 +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
+ CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y
+-CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
 # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
- CONFIG_USES_NOR_BOOTFLASH=y
- CONFIG_RELOCATE_SIMPLE=y
--- a/target/linux/ixp4xx/image/apex/patches/130_fatslug_sdram_init.patch
+++ b/target/linux/ixp4xx/image/apex/patches/130_fatslug_sdram_init.patch
@ -1,28 +0,0 @@
-Index: apex-1.5.13/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config
-===================================================================
--- apex-1.5.13.orig/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config	2008-01-27 21:11:10.000000000 +1030
-+++ apex-1.5.13/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config	2008-01-27 21:21:31.000000000 +1030
-@@ -136,7 +136,8 @@
- CONFIG_AUTOBOOT_DELAY=10
- CONFIG_ENV_STARTUP_KERNEL_COPY=y
- # CONFIG_ENV_REGION_KERNEL_SWAP is not set
-# CONFIG_ENV_STARTUP_PREFIX_P is not set
-+CONFIG_ENV_STARTUP_PREFIX_P=y
-+CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m"
- 
- #
- #    Regions
-Index: apex-1.5.13/src/mach-ixp42x/slugos-nslu2-armeb_config
-===================================================================
--- apex-1.5.13.orig/src/mach-ixp42x/slugos-nslu2-armeb_config	2008-01-27 21:11:10.000000000 +1030
-+++ apex-1.5.13/src/mach-ixp42x/slugos-nslu2-armeb_config	2008-01-27 21:21:23.000000000 +1030
-@@ -136,7 +136,8 @@
- CONFIG_AUTOBOOT_DELAY=10
- CONFIG_ENV_STARTUP_KERNEL_COPY=y
- # CONFIG_ENV_REGION_KERNEL_SWAP is not set
-# CONFIG_ENV_STARTUP_PREFIX_P is not set
-+CONFIG_ENV_STARTUP_PREFIX_P=y
-+CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m"
- 
- #
- #    Regions
--- a/target/linux/ixp4xx/image/apex/patches/140-openwrt_fsg3_armeb_config.patch
+++ b/target/linux/ixp4xx/image/apex/patches/140-openwrt_fsg3_armeb_config.patch
@ -0,0 +1,21 @@
+--- apex-1.5.6/src/mach-ixp42x/slugos-fsg3-armeb_config	2007-06-02 10:06:45.000000000 +0930
+++ apex-1.5.6/src/mach-ixp42x/slugos-fsg3-armeb_config~	2007-06-03 02:22:18.000000000 +0930
+@@ -17,7 +17,7 @@
+ #
+ # General Setup
+ #
+-CONFIG_TARGET_DESCRIPTION="SlugOS FSG3/BE"
+CONFIG_TARGET_DESCRIPTION="OpenWRT FSG3"
+ CONFIG_CROSS_COMPILE=""
+ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+ # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
+@@ -143,7 +143,7 @@
+ #    Overrides
+ #
+ CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
+-CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/sda1 rootdelay=10 console=ttyS0,115200"
+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/sda1 rootdelay=10 console=ttyS0,115200 init=/etc/preinit noinitrd"
+ CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y
+-CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/sda2 rootdelay=10 console=ttyS0,115200"
+CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock2 rootfstype=squashfs console=ttyS0,115200 init=/etc/preinit noinitrd"
+ # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set