From 63df6130ca3ccffadd916471040ee6ae29de35a6 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 26 Mar 2010 14:27:22 +0000 Subject: [PATCH] package/apex: refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20451 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/100-openwrt_nslu2_armeb_config.patch | 10 ++++++---- .../120-openwrt_nslu2_16mb_armeb_config.patch | 10 ++++++---- .../apex/patches/140-openwrt_fsg3_armeb_config.patch | 12 +++++++----- package/apex/patches/150-limit_ram_to_64mb.patch | 12 ++++++------ .../patches/160-openwrt_nas100d_armeb_config.patch | 12 +++++++----- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/package/apex/patches/100-openwrt_nslu2_armeb_config.patch b/package/apex/patches/100-openwrt_nslu2_armeb_config.patch index 55267d40a..49933eab3 100644 --- a/package/apex/patches/100-openwrt_nslu2_armeb_config.patch +++ b/package/apex/patches/100-openwrt_nslu2_armeb_config.patch @@ -1,6 +1,6 @@ ---- apex-1.5.6/src/mach-ixp42x/slugos-nslu2-armeb_config 2007-06-02 10:06:45.000000000 +0930 -+++ apex-1.5.6/src/mach-ixp42x/slugos-nslu2-armeb_config~ 2007-06-03 02:22:18.000000000 +0930 -@@ -17,7 +17,7 @@ +--- a/src/mach-ixp42x/slugos-nslu2-armeb_config ++++ b/src/mach-ixp42x/slugos-nslu2-armeb_config +@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y # # General Setup # @@ -9,7 +9,7 @@ CONFIG_CROSS_COMPILE="" CONFIG_AEABI=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y -@@ -143,7 +143,7 @@ +@@ -150,9 +150,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern # Overrides # CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y @@ -19,3 +19,5 @@ -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_ENV_DEFAULT_STARTUP_ALT_P is not set + CONFIG_USES_NOR_BOOTFLASH=y diff --git a/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch b/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch index a358c3f3b..47920914b 100644 --- a/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch +++ b/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch @@ -1,6 +1,6 @@ ---- apex-1.5.6/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config 2007-06-02 10:06:45.000000000 +0930 -+++ apex-1.5.6/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config~ 2007-06-03 02:22:18.000000000 +0930 -@@ -17,7 +17,7 @@ +--- a/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config ++++ b/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config +@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y # # General Setup # @@ -9,7 +9,7 @@ CONFIG_CROSS_COMPILE="" CONFIG_AEABI=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y -@@ -143,7 +143,7 @@ +@@ -150,9 +150,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern # Overrides # CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y @@ -19,3 +19,5 @@ -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_ENV_DEFAULT_STARTUP_ALT_P is not set + CONFIG_USES_NOR_BOOTFLASH=y diff --git a/package/apex/patches/140-openwrt_fsg3_armeb_config.patch b/package/apex/patches/140-openwrt_fsg3_armeb_config.patch index 1deacf3c2..a1651e69a 100644 --- a/package/apex/patches/140-openwrt_fsg3_armeb_config.patch +++ b/package/apex/patches/140-openwrt_fsg3_armeb_config.patch @@ -1,15 +1,15 @@ ---- 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 @@ +--- a/src/mach-ixp42x/slugos-fsg3-armeb_config ++++ b/src/mach-ixp42x/slugos-fsg3-armeb_config +@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y # # General Setup # -CONFIG_TARGET_DESCRIPTION="SlugOS FSG3/BE" +CONFIG_TARGET_DESCRIPTION="OpenWRT FSG3" CONFIG_CROSS_COMPILE="" + CONFIG_AEABI=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y - # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set -@@ -143,7 +143,7 @@ +@@ -148,9 +148,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern # Overrides # CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y @@ -19,3 +19,5 @@ -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 + # CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set + CONFIG_USES_NOR_BOOTFLASH=y diff --git a/package/apex/patches/150-limit_ram_to_64mb.patch b/package/apex/patches/150-limit_ram_to_64mb.patch index 79ecd9759..3e178166e 100644 --- a/package/apex/patches/150-limit_ram_to_64mb.patch +++ b/package/apex/patches/150-limit_ram_to_64mb.patch @@ -1,6 +1,6 @@ ---- apex-1.5.13/src/mach-ixp42x/slugos-nslu2-armeb_config~ 2008-11-28 14:05:56.905634749 +0000 -+++ apex-1.5.13/src/mach-ixp42x/slugos-nslu2-armeb_config 2008-12-06 13:15:49.857504031 +0000 -@@ -135,7 +135,7 @@ +--- a/src/mach-ixp42x/slugos-nslu2-armeb_config ++++ b/src/mach-ixp42x/slugos-nslu2-armeb_config +@@ -137,7 +137,7 @@ CONFIG_AUTOBOOT_DELAY=10 CONFIG_ENV_STARTUP_KERNEL_COPY=y # CONFIG_ENV_REGION_KERNEL_SWAP is not set CONFIG_ENV_STARTUP_PREFIX_P=y @@ -9,9 +9,9 @@ # # Regions ---- apex-1.5.13/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config~ 2008-11-28 14:05:56.905634749 +0000 -+++ apex-1.5.13/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config 2008-12-06 13:17:41.311867740 +0000 -@@ -135,7 +135,7 @@ +--- a/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config ++++ b/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config +@@ -137,7 +137,7 @@ CONFIG_AUTOBOOT_DELAY=10 CONFIG_ENV_STARTUP_KERNEL_COPY=y # CONFIG_ENV_REGION_KERNEL_SWAP is not set CONFIG_ENV_STARTUP_PREFIX_P=y diff --git a/package/apex/patches/160-openwrt_nas100d_armeb_config.patch b/package/apex/patches/160-openwrt_nas100d_armeb_config.patch index 2eb9b6cbc..83d8c3f71 100644 --- a/package/apex/patches/160-openwrt_nas100d_armeb_config.patch +++ b/package/apex/patches/160-openwrt_nas100d_armeb_config.patch @@ -1,18 +1,20 @@ ---- apex-1.5.6/src/mach-ixp42x/slugos-nas100d-armeb_config 2007-06-02 10:06:45.000000000 +0930 -+++ apex-1.5.6/src/mach-ixp42x/slugos-nas100d-armeb_config~ 2007-06-03 02:22:18.000000000 +0930 -@@ -17,7 +17,7 @@ +--- a/src/mach-ixp42x/slugos-nas100d-armeb_config ++++ b/src/mach-ixp42x/slugos-nas100d-armeb_config +@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y # # General Setup # -CONFIG_TARGET_DESCRIPTION="SlugOS NAS100D/BE" +CONFIG_TARGET_DESCRIPTION="OpenWRT NAS100D" CONFIG_CROSS_COMPILE="" + CONFIG_AEABI=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y - # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set -@@ -143,5 +143,5 @@ +@@ -145,7 +145,7 @@ CONFIG_ENV_REGION_KERNEL="fis://kernel" # Overrides # CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y -CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200" +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 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