nslu2: fix boot (initramfs via tftp tested)

6 files changed, 65 insertions, 17 deletions

diff --git a/target/arm/Makefile b/target/arm/Makefile
index e029fb72b..2f937c8ab 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -98,6 +98,10 @@ ifeq ($(ADK_TARGET_FS),nfsroot)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
+ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_NSLU2),y)
+	@echo "Use following in RedBoot bootloader:"
+	@echo "RedBoot> ip_address -l <localip> -h <serverip>; load -r -v -b 0x01d00000 ${TARGET_KERNEL}; exec 0x01d00000"
+endif
 endif
 ifeq ($(ADK_TARGET_FS),squashfs)
 targethelp:
diff --git a/target/arm/kernel/linksys-nslu2 b/target/arm/kernel/linksys-nslu2
index efd09841f..a0a941721 100644
--- a/target/arm/kernel/linksys-nslu2
+++ b/target/arm/kernel/linksys-nslu2
@@ -1,6 +1,12 @@
 CONFIG_ARM=y
+CONFIG_ARCH_IXDP425=y
+CONFIG_ARCH_IXDP4XX=y
+CONFIG_ARCH_IXP4XX=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ATAGS=y
 CONFIG_CPU_XSCALE=y
-CONFIG_ARCH_IXP4XX=y
+CONFIG_IXP4XX_NPE=y
+CONFIG_IXP4XX_QMGR=y
+CONFIG_IXP4XX_WATCHDOG=y
 CONFIG_MACH_NSLU2=y
-CONFIG_ATAGS=y
+CONFIG_FPE_NWFPE=y
diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2
index ad0817e0d..7c359b7e7 100644
--- a/target/arm/systems/linksys-nslu2
+++ b/target/arm/systems/linksys-nslu2
@@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_NETDEVICE
 	select ADK_TARGET_WITH_BLOCK
+	select ADK_TARGET_WITH_I2C
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs
index d5618bedb..0c8cdfcfa 100644
--- a/target/config/Config.in.rootfs
+++ b/target/config/Config.in.rootfs
@@ -97,7 +97,8 @@ config ADK_TARGET_ROOTFS_NFSROOT
 	           !ADK_TARGET_VBOX && \
 		   !ADK_TARGET_SYSTEM_ARANYM_M68K && \
 		   !ADK_TARGET_SYSTEM_ARM_FM && \
-		   !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+		   !ADK_TARGET_SYSTEM_FOXBOARD_LX832 && \
+		   !ADK_TARGET_SYSTEM_LINKSYS_NSLU2 
 	help
 	  Root filesystem mounted via NFS. (DHCP)
 
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index cfb12e1db..8742b40c6 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -56,6 +56,13 @@ config ADK_KERNEL_NET_VENDOR_STMICRO
 config ADK_KERNEL_NET_VENDOR_XILINX
 	bool
 
+config ADK_KERNEL_NET_VENDOR_XSCALE
+	select ADK_KERNEL_NET_VENDOR_INTEL
+	bool
+
+config ADK_KERNEL_NET_PTP_CLASSIFY
+	bool
+
 config ADK_KERNEL_PHYLIB
 	bool
 
@@ -120,6 +127,33 @@ config ADK_KERNEL_AG71XX
 	help
 	  Atheros AG71XX ethernet driver
 
+config ADK_KERNEL_FEC
+	tristate "FEC ethernet driver"
+	select ADK_KERNEL_NET_VENDOR_FREESCALE
+	select ADK_KERNEL_AT803X_PHY
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 || \
+		   ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 || \
+		   ADK_TARGET_SYSTEM_KINETIS_K70
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default y if ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
+	default n
+	help
+	  FEC ethernet driver
+
+
+config ADK_KERNEL_IXP4XX_ETH
+	tristate "IXP4XX ethernet driver"
+	select ADK_KERNEL_NET_VENDOR_XSCALE
+	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_PHYLIB
+	select ADK_KERNEL_MII
+	select ADK_KERNEL_NET_PTP_CLASSIFY
+	depends on ADK_TARGET_SYSTEM_LINKSYS_NSLU2
+	default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2
+	default n
+	help
+	  IXP4XX ethernet driver
+
 config ADK_KERNEL_KINETIS_MAC
 	bool "Kinetis ethernet driver"
 	select ADK_KERNEL_NET_ETHERNET
@@ -134,19 +168,6 @@ config ADK_KERNEL_KINETIS_MAC
 	help
 	  Ethernet driver for Kinetis K70
 
-config ADK_KERNEL_FEC
-	tristate "FEC ethernet driver"
-	select ADK_KERNEL_NET_VENDOR_FREESCALE
-	select ADK_KERNEL_AT803X_PHY
-	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 || \
-		   ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 || \
-		   ADK_TARGET_SYSTEM_KINETIS_K70
-	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	default y if ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
-	default n
-	help
-	  FEC ethernet driver
-
 config ADK_KERNEL_KORINA
 	tristate "Korina ethernet driver"
 	depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index 13149c47d..60fe49bee 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -8,7 +8,22 @@ config ADK_KERNEL_I2C
  	bool
 
 config ADK_KERNEL_I2C_CHARDEV
- 	tristate
+	tristate
+
+config ADK_KERNEL_I2C_BOARDINFO
+	tristate
+
+config ADK_KERNEL_I2C_ALGOBIT
+	tristate
+
+config ADK_KERNEL_I2C_GPIO
+	bool
+	select ADK_KERNEL_I2C
+	select ADK_KERNEL_I2C_CHARDEV
+	select ADK_KERNEL_I2C_BOARDINFO
+	select ADK_KERNEL_I2C_ALGOBIT
+	default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2
+	help
 
 config ADK_KERNEL_I2C_BCM2708
 	tristate "I2C driver for BCM28XX boards"