aboutsummaryrefslogtreecommitdiffstats
path: root/package/apex/patches
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-04-06 09:56:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-04-06 09:56:30 +0000
commit0cb0c1a257f52266056306e0b8bcb5fb27bdf989 (patch)
tree1fc64ae50c1bd8cf17a92ef5aacf54778da1ac2a /package/apex/patches
parent9493f9c19ed2c7d407dcd70e72934c00e3b5849a (diff)
downloadupstream-0cb0c1a257f52266056306e0b8bcb5fb27bdf989.tar.gz
upstream-0cb0c1a257f52266056306e0b8bcb5fb27bdf989.tar.bz2
upstream-0cb0c1a257f52266056306e0b8bcb5fb27bdf989.zip
ixp4xx: make apex optional, clean up the makefile - fixes spurious recompilation issues
SVN-Revision: 15115
Diffstat (limited to 'package/apex/patches')
-rw-r--r--package/apex/patches/100-openwrt_nslu2_armeb_config.patch21
-rw-r--r--package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch21
-rw-r--r--package/apex/patches/140-openwrt_fsg3_armeb_config.patch21
-rw-r--r--package/apex/patches/150-limit_ram_to_64mb.patch22
-rw-r--r--package/apex/patches/160-openwrt_nas100d_armeb_config.patch18
5 files changed, 103 insertions, 0 deletions
diff --git a/package/apex/patches/100-openwrt_nslu2_armeb_config.patch b/package/apex/patches/100-openwrt_nslu2_armeb_config.patch
new file mode 100644
index 0000000000..55267d40af
--- /dev/null
+++ b/package/apex/patches/100-openwrt_nslu2_armeb_config.patch
@@ -0,0 +1,21 @@
+--- 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 @@
+ #
+ # General Setup
+ #
+-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
+@@ -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
diff --git a/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch b/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
new file mode 100644
index 0000000000..a358c3f3b6
--- /dev/null
+++ b/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
@@ -0,0 +1,21 @@
+--- 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 @@
+ #
+ # General Setup
+ #
+-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
+@@ -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
diff --git a/package/apex/patches/140-openwrt_fsg3_armeb_config.patch b/package/apex/patches/140-openwrt_fsg3_armeb_config.patch
new file mode 100644
index 0000000000..1deacf3c2f
--- /dev/null
+++ b/package/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
diff --git a/package/apex/patches/150-limit_ram_to_64mb.patch b/package/apex/patches/150-limit_ram_to_64mb.patch
new file mode 100644
index 0000000000..79ecd9759b
--- /dev/null
+++ b/package/apex/patches/150-limit_ram_to_64mb.patch
@@ -0,0 +1,22 @@
+--- 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 @@
+ CONFIG_ENV_STARTUP_KERNEL_COPY=y
+ # CONFIG_ENV_REGION_KERNEL_SWAP is not set
+ CONFIG_ENV_STARTUP_PREFIX_P=y
+-CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m"
++CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+64m"
+
+ #
+ # 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 @@
+ CONFIG_ENV_STARTUP_KERNEL_COPY=y
+ # CONFIG_ENV_REGION_KERNEL_SWAP is not set
+ CONFIG_ENV_STARTUP_PREFIX_P=y
+-CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m"
++CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+64m"
+
+ #
+ # Regions
diff --git a/package/apex/patches/160-openwrt_nas100d_armeb_config.patch b/package/apex/patches/160-openwrt_nas100d_armeb_config.patch
new file mode 100644
index 0000000000..2eb9b6cbc3
--- /dev/null
+++ b/package/apex/patches/160-openwrt_nas100d_armeb_config.patch
@@ -0,0 +1,18 @@
+--- 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 @@
+ #
+ # General Setup
+ #
+-CONFIG_TARGET_DESCRIPTION="SlugOS NAS100D/BE"
++CONFIG_TARGET_DESCRIPTION="OpenWRT NAS100D"
+ CONFIG_CROSS_COMPILE=""
+ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+ # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
+@@ -143,5 +143,5 @@
+ # 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