Suppress promc.c.orig, fix the nand detection with newer boards (#2038)

[openwrt.git] / target / linux / at91-2.6 / image / Config.in

diff --git a/target/linux/at91-2.6/image/Config.in b/target/linux/at91-2.6/image/Config.in
index 086f10d..6607f6c 100644 (file)
--- a/target/linux/at91-2.6/image/Config.in
+++ b/target/linux/at91-2.6/image/Config.in
@@ -1,8 +1,3 @@
-config AT91_ROMBOOT
-       bool "Build romboot loader"
-       depends LINUX_2_6_AT91
-       default y
-

 config AT91_DFBOOT
        bool "Build dataflashboot loader"
        depends LINUX_2_6_AT91
 config AT91_DFBOOT
        bool "Build dataflashboot loader"
        depends LINUX_2_6_AT91


@@ -15,9 +10,26 @@ config AT91_UBOOT
 
 config UBOOT_TARGET
        string "U-Boot Board Configuration"
 
 config UBOOT_TARGET
        string "U-Boot Board Configuration"

+       depends LINUX_2_6_AT91
+       depends AT91_UBOOT

        default "vlink"
        help
        default "vlink"
        help

-         For all supported boards there are reqdy-to-use default
+         For all supported boards there are ready-to-use default

                configurations available; just type "<board_name>".
 
                configurations available; just type "<board_name>".
 

+config UBOOT_IPADDR
+       string "IP Address for U-Boot"
+       depends LINUX_2_6_AT91
+       depends AT91_UBOOT
+       default "192.168.0.178"
+       help
+         IP address of device to be used in U-Boot
+
+config UBOOT_SERVERIP
+       string "IP Address of TFTP server"
+       depends LINUX_2_6_AT91
+       depends AT91_UBOOT
+       default "192.168.0.232"
+       help
+         IP address of TFTP server for U-Boot