From 5381e1c4862578b1265cdbe66cf65db3d7ca3b22 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Fri, 7 Mar 2008 07:24:35 +0000 Subject: revert bad U-Boot patch --- target/device/Atmel/u-boot/Config.in | 115 +++++++++-------------------------- 1 file changed, 28 insertions(+), 87 deletions(-) (limited to 'target/device/Atmel/u-boot/Config.in') diff --git a/target/device/Atmel/u-boot/Config.in b/target/device/Atmel/u-boot/Config.in index edefb52bb..62988ebe4 100644 --- a/target/device/Atmel/u-boot/Config.in +++ b/target/device/Atmel/u-boot/Config.in @@ -1,103 +1,44 @@ -config BR2_TARGET_U_BOOT - bool "u-boot" +config BR2_TARGET_UBOOT + bool "Das U-Boot Boot Monitor" + depends on BR2_TARGET_AT91 + depends on !BR2_TARGET_AT91SAM9260PF default n - depends on BR2_avr32 || BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_m68k || BR2_mips || BR2_nios2 help - U-Boot, the universal boot loader for multiple platforms and target - boards. + Build "Das U-Boot" Boot Monitor - http://www.denx.de/wiki/UBoot/ - -config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE - string "U-Boot config header file" - depends on BR2_TARGET_U_BOOT - help - Set this variable to a file containing a U-Boot configuration for the - target board. This file will be copied into the U-Boot directory - include/configs. - -config BR2_TARGET_U_BOOT_CONFIG_BOARD - string "U-Boot target board configuration" - depends on BR2_TARGET_U_BOOT +config BR2_TARGET_UBOOT_SERVERIP + string "server ip" + depends on BR2_TARGET_UBOOT + default "10.175.196.221" help - Set this variable to the target board you want to configure U-Boot - for. This will use the default options for this board in U-Boot and - build accordingly. - - For example "atstk1002_config" for ATSTK1000 with ATSTK1002 top - module for the AVR32 starter kit. + TFTP server ip address -config BR2_TARGET_U_BOOT_SERVERIP - string "Server IP" - depends on BR2_TARGET_U_BOOT - default "192.168.0.1" +config BR2_TARGET_UBOOT_IPADDR + string "ip address" + depends on BR2_TARGET_UBOOT + default "10.175.196.18" help - The IP address for the remote server providing TFTP services. + TFTP server ip address -config BR2_TARGET_U_BOOT_IPADDR - string "Target IP address" - depends on BR2_TARGET_U_BOOT - default "192.168.0.42" +config BR2_TARGET_UBOOT_GATEWAY + string "gateway ip" + depends on BR2_TARGET_UBOOT + default "10.175.196.1" help - Target board IP address, only set this if you intend to use a fixed - address (i.e. no DHCP). A blanc target IP address will allow the - board to use DHCP. + Gateway ip address -config BR2_TARGET_U_BOOT_GATEWAY - string "Gateway IP" - depends on BR2_TARGET_U_BOOT && BR2_TARGET_U_BOOT_IPADDR != "" - default "192.168.0.1" - help - Set the gateway IP address if you need to connect to a machine - outside the netmask for the network. - -config BR2_TARGET_U_BOOT_NETMASK +config BR2_TARGET_UBOOT_NETMASK string "netmask" - depends on BR2_TARGET_U_BOOT && BR2_TARGET_U_BOOT_IPADDR != "" + depends on BR2_TARGET_UBOOT default "255.255.255.0" help - Network mask for the target board network. - -config BR2_TARGET_U_BOOT_ETH0ADDR - string "Ethernet 0 address" - depends on BR2_TARGET_U_BOOT - help - Target board MAC address for interface 0. You should have a MAC - address range provided by the company who made you MAC hardware. - -config BR2_TARGET_U_BOOT_ETH1ADDR - string "Ethernet 1 address" - depends on BR2_TARGET_U_BOOT - help - Target board MAC address for interface 1. You should have a MAC - address range provided by the company who made you MAC hardware. - -config BR2_TARGET_U_BOOT_BOOTARGS - string "Boot arguments" - depends on BR2_TARGET_U_BOOT - default "console=ttyS0 root=/dev/mtdblock1 rootfstype=jffs2" - help - Set the boot arguments in U-Boot to let it boot the way you prefer by - default. Typoes here will result in a non-booting target board. - - Example booting from MMC/SD-card: - console=ttyS0 root=/dev/mmcblk0p1 - - Example booting from flash devices (NOR, NAND, DataFlash, etc): - console=ttyS0 root=/dev/mtdblock1 rootfstype=jffs2 + Network Mask -config BR2_TARGET_U_BOOT_BOOTCMD - string "Boot command" - depends on BR2_TARGET_U_BOOT - default "fsload /boot/$(LINUX26_FORMAT); bootm" +config BR2_TARGET_UBOOT_ETHADDR + string "Ethernet address" + depends on BR2_TARGET_UBOOT + default "04:25:fe:ed:00:18" help - Set the boot command in U-Boot which specifies how U-Boot should load - your kernel image, or if you want to do other commands automatically - when U-Boot starts. + Target ip address, this should be changed for production units - Loading a kernel from MMC/SD-card: - mmcinit; ext2load mmc 0:1 - /boot/$(BR2_PACKAGE_LINUX_FORMAT); bootm - Loading a kernel from flash devices (NOR, NAND, DataFlash, etc): - fsload /boot/$(BR2_PACKAGE_LINUX_FORMAT); bootm -- cgit v1.2.3