arm: atmel: get rid of too many ifdeffery

[karo-tx-uboot.git] / include / configs / ac14xx.h

diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index e06e9ea24b991af19595e918ccd8ecc91d71896e..a2090dac865b30b03478baf2591db382d2c59152 100644 (file)
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -2,18 +2,7 @@
  * (C) Copyright 2009 Wolfgang Denk <wd@denx.de>
  * (C) Copyright 2010 DAVE Srl <www.dave.eu>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -505,15 +494,15 @@
        "echo"
 
 #define CONFIG_EXTRA_ENV_SETTINGS_DEVEL                                        \
-       "muster_nr=00\0"                                                \
+       "muster_nr=-00\0"                                               \
        "fromram=run ramargs addip addtty; "                            \
-               "tftp ${fdt_addr_r} k6m2/ac14xx.dtb-${muster_nr}; "     \
-               "tftp ${kernel_addr_r} k6m2/uImage-${muster_nr}; "      \
-               "tftp ${ramdisk_addr_r} k6m2/uFS-${muster_nr}; "        \
+               "tftp ${fdt_addr_r} ac14xx/ac14xx.dtb${muster_nr}; "    \
+               "tftp ${kernel_addr_r} ac14xx/uImage${muster_nr}; "     \
+               "tftp ${ramdisk_addr_r} ac14xx/uFS${muster_nr}; "       \
                "bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
        "fromnfs=run nfsargs addip addtty; "                            \
-               "tftp ${fdt_addr_r} k6m2/ac14xx.dtb-${muster_nr}; "     \
-               "tftp ${kernel_addr_r} k6m2/uImage-${muster_nr}; "      \
+               "tftp ${fdt_addr_r} ac14xx/ac14xx.dtb${muster_nr}; "    \
+               "tftp ${kernel_addr_r} ac14xx/uImage${muster_nr}; "     \
                "bootm ${kernel_addr_r} - ${fdt_addr_r}\0"              \
        "fromflash=run nfsargs addip addtty; "                          \
                "bootm fc020000 - fc000000\0"                           \
@@ -541,12 +530,11 @@
        "u-boot=ac14xx/u-boot.bin\0"                                    \
        "bootfile=ac14xx/uImage\0"                                      \
        "fdtfile=ac14xx/ac14xx.dtb\0"                                   \
-       "rootpath=/opt/eldk/ppc_6xx\n"                                  \
        "netdev=eth0\0"                                                 \
        "consdev=ttyPSC0\0"                                             \
        "hostname=ac14xx\0"                                             \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=${serverip}:${rootpath}-${muster_nr}\0"        \
+               "nfsroot=${serverip}:${rootpath}${muster_nr}\0" \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
        "addip=setenv bootargs ${bootargs} "                            \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
@@ -576,6 +564,8 @@
 
 #define CONFIG_BOOTCOMMAND     "run production"
 
+#define CONFIG_ARP_TIMEOUT     200UL
+
 #define CONFIG_FIT             1
 #define CONFIG_OF_LIBFDT       1
 #define CONFIG_OF_BOARD_SETUP  1