From b5992e77effcf15cbd50753fd85033a3f9887825 Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Wed, 5 Jun 2013 14:51:06 +0200 Subject: ac14xx: cleanup comments in the board support fix typos, minor rephrasing, remove obsolete notes and TODO items Signed-off-by: Gerhard Sittig --- include/configs/ac14xx.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 7cb10fb..5dbcba2 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -72,7 +72,7 @@ #define CONFIG_SYS_MAX_RAM_SIZE 0x20000000 /* - * DDR Controller Configuration XXX TODO + * DDR Controller Configuration * * SYS_CFG: * [31:31] MDDRC Soft Reset: Diabled @@ -265,7 +265,6 @@ /* * CS related parameters - * TODO document these */ /* CS0 Flash */ #define CONFIG_SYS_CS0_CFG 0x00031110 @@ -506,7 +505,7 @@ #define CONFIG_BOOTDELAY 2 /* -1 disables auto-boot */ -/* XXX TODO need to specify the builtin environment */ +/* the builtin environment and standard greeting */ #define CONFIG_PREBOOT "echo;" \ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ "echo" -- cgit v1.1 From 81b0fb04101da1bf1e399bbf56c86d0ad3a2fe3d Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Wed, 5 Jun 2013 14:51:09 +0200 Subject: ac14xx: remove obsolete board config items - use the default baudrate table for serial communication - remove hostname/boofile/rootpath defines which were not referenced elsewhere Signed-off-by: Gerhard Sittig --- include/configs/ac14xx.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'include') diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 5dbcba2..e06e9ea 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -330,8 +330,6 @@ #endif #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#define CONFIG_SYS_BAUDRATE_TABLE \ - {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} #define CONSOLE_FIFO_TX_SIZE FIFOC_PSC3_TX_SIZE #define CONSOLE_FIFO_TX_ADDR FIFOC_PSC3_TX_ADDR @@ -496,10 +494,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_TIMESTAMP -#define CONFIG_HOSTNAME ac14xx -#define CONFIG_BOOTFILE "ac14xx/uImage" -#define CONFIG_ROOTPATH "/opt/eldk/ppc_6xx" - /* default load addr for tftp and bootm */ #define CONFIG_LOADADDR 400000 -- cgit v1.1 From 4779025c1ed685247c338763f2e1e0a17d201c51 Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Wed, 5 Jun 2013 14:51:10 +0200 Subject: ac14xx: use the official product name everywhere remove remaining "k6" code names, switch to the official 'ac14xx' name Signed-off-by: Gerhard Sittig --- include/configs/ac14xx.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index e06e9ea..fcb56f4 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -507,13 +507,13 @@ #define CONFIG_EXTRA_ENV_SETTINGS_DEVEL \ "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" \ -- cgit v1.1 From 6c5001d5429bed52c25cbfc1ed6e244beced3ed5 Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Wed, 5 Jun 2013 14:51:11 +0200 Subject: ac14xx: rephrase network boot config for development - remove the builtin 'rootpath' spec (according to U-Boot project policy) and require user provided environments to contain these - rephrase the evaluation of the 'muster_nr' approach which allows to quickly switch among several network boot setups (make the setting transparent when empty, resulting in default DULG behaviour) - reduce the ARP timeout for faster network boot Signed-off-by: Gerhard Sittig --- include/configs/ac14xx.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index fcb56f4..381bcdd 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -505,15 +505,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} ac14xx/ac14xx.dtb-${muster_nr}; " \ - "tftp ${kernel_addr_r} ac14xx/uImage-${muster_nr}; " \ - "tftp ${ramdisk_addr_r} ac14xx/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} ac14xx/ac14xx.dtb-${muster_nr}; " \ - "tftp ${kernel_addr_r} ac14xx/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 +541,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 +575,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 -- cgit v1.1