From 1598ebd3fb256c753d8dc087388ccaba3732a44e Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 31 May 2007 13:43:08 +0000 Subject: [PATCH] apex: Revert back to 1.4.7 - what I thought I tested wasn't what I actually tested at all, and what I eventually tested didn't work. SVN-Revision: 7422 --- target/linux/ixp4xx-2.6/image/apex/Makefile | 4 +- .../100-slugos-nslu2-armeb_config.patch | 144 ++++++++++++++++-- 2 files changed, 136 insertions(+), 12 deletions(-) diff --git a/target/linux/ixp4xx-2.6/image/apex/Makefile b/target/linux/ixp4xx-2.6/image/apex/Makefile index 8d202904d0..7b781cfbdb 100644 --- a/target/linux/ixp4xx-2.6/image/apex/Makefile +++ b/target/linux/ixp4xx-2.6/image/apex/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apex -PKG_VERSION:=1.5.4 +PKG_VERSION:=1.4.7 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:=b07790b259f48653c32955244c23cc57 +PKG_MD5SUM:=ed2183311aacf5714afbd825f3671417 include $(INCLUDE_DIR)/package.mk diff --git a/target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch b/target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch index 318535534e..c05812dfe0 100644 --- a/target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch +++ b/target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch @@ -1,11 +1,135 @@ ---- apex-1.5.4/src/mach-ixp42x/slugos-nslu2-armeb_config~ 2007-05-31 15:00:02.000000000 +0930 -+++ apex-1.5.4/src/mach-ixp42x/slugos-nslu2-armeb_config 2007-05-31 22:51:06.000000000 +0930 -@@ -142,7 +142,7 @@ - # Overrides - # - CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y --CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200" +--- + src/mach-ixp42x/slugos-nslu2-armeb_config | 126 ++++++++++++++++++++++++++++++ + 1 file changed, 126 insertions(+) + +Index: apex-1.4.7/src/mach-ixp42x/slugos-nslu2-armeb_config +=================================================================== +--- /dev/null ++++ apex-1.4.7/src/mach-ixp42x/slugos-nslu2-armeb_config +@@ -0,0 +1,126 @@ ++# ++# Automatically generated make config: don't edit ++# Linux kernel version: ++# Sun Oct 22 14:17:09 2006 ++# ++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_EXPERIMENTAL=y ++# CONFIG_SMALL is not set ++ ++# ++# General Setup ++# ++CONFIG_CROSS_COMPILE="" ++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_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=0x00800000 ++CONFIG_ENV_STARTUP="" ++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_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_ERASEENV is not set ++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 is not set ++ ++# ++# 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:0x7e0000+4k" ++CONFIG_DRIVER_NOR_CFI=y ++# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set ++CONFIG_USES_NOR_CFI=y ++CONFIG_USES_PATHNAME_PARSER=y ++ ++# ++# Environment ++# ++CONFIG_ENV=y ++# CONFIG_NO_BOOTSTRAP is not set ++CONFIG_NOR_BOOT=y ++# CONFIG_NAND_BOOT is not set ++# CONFIG_COMPANION_EVT1_BOOT is not set ++# CONFIG_COMPANION_EVT2_BOOT is not set ++CONFIG_AUTOBOOT=y ++CONFIG_AUTOBOOT_DELAY=10 ++CONFIG_ENV_MUTABLE=y ++CONFIG_ENV_LINK=y ++CONFIG_ENV_REGION="nor:0x7f8000+16k" ++CONFIG_ENV_CHECK_LEN=1024 ++CONFIG_ENV_STARTUP_KERNEL_COPY=y ++CONFIG_ENV_REGION_KERNEL="fis://kernel" ++# CONFIG_ENV_REGION_KERNEL_SWAP is not set ++CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y +CONFIG_ENV_DEFAULT_CMDLINE="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 ++# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set ++CONFIG_USES_NOR_BOOTFLASH=y ++CONFIG_BIGENDIAN=y ++CONFIG_CLEAR_STACKS=y ++CONFIG_ALIASES=y