diff options
| author | Stefan Roese <sr@denx.de> | 2008-01-16 11:22:30 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-01-16 11:22:30 +0100 |
| commit | 8d99cd0691b7094ea1e2bf5309b0877047a9f375 (patch) | |
| tree | 464c5cbd4ffe06419bcb03d8c9e9499a77fbd4d4 /include | |
| parent | 9adfc9fb9ade64cdf1ed9ff842e4f900cbda78bd (diff) | |
| parent | 58d204256cb1ce1bd323847d9f644acf70a72e6a (diff) | |
| download | u-boot-imx-8d99cd0691b7094ea1e2bf5309b0877047a9f375.zip u-boot-imx-8d99cd0691b7094ea1e2bf5309b0877047a9f375.tar.gz u-boot-imx-8d99cd0691b7094ea1e2bf5309b0877047a9f375.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include')
| -rw-r--r-- | include/commproc.h | 2 | ||||
| -rw-r--r-- | include/configs/TK885D.h | 7 | ||||
| -rw-r--r-- | include/configs/ads5121.h | 12 | ||||
| -rw-r--r-- | include/configs/lwmon5.h | 6 |
4 files changed, 19 insertions, 8 deletions
diff --git a/include/commproc.h b/include/commproc.h index 6b1b4e8..32a3e1c 100644 --- a/include/commproc.h +++ b/include/commproc.h @@ -1448,7 +1448,9 @@ typedef struct scc_enet { */ #define PROFF_ENET PROFF_SCC2 #define CPM_CR_ENET CPM_CR_CH_SCC2 +#if (!defined(CONFIG_TK885D)) /* TK885D does not use SCC Ethernet */ #define SCC_ENET 1 +#endif #define PA_ENET_RXD ((ushort)0x0004) /* PA 13 */ #define PA_ENET_TXD ((ushort)0x0008) /* PA 12 */ #define PA_ENET_RCLK ((ushort)0x0100) /* PA 7 */ diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 761a352..c43fef6 100644 --- a/include/configs/TK885D.h +++ b/include/configs/TK885D.h @@ -64,6 +64,8 @@ #undef CONFIG_BOOTARGS #define CONFIG_EXTRA_ENV_SETTINGS \ + "ethprime=FEC ETHERNET\0" \ + "ethact=FEC ETHERNET\0" \ "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath}\0" \ @@ -77,7 +79,8 @@ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0" \ "rootpath=/opt/eldk/ppc_8xx\0" \ - "bootfile=/tftpboot/TQM885D/uImage\0" \ + "bootfile=/tftpboot/tk885d/uImage\0" \ + "u-boot=/tftpboot/tk885d/u-boot.bin\0" \ "kernel_addr=40080000\0" \ "ramdisk_addr=40180000\0" \ "load=tftp 200000 ${u-boot}\0" \ @@ -254,7 +257,7 @@ #define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */ -#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ #define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE) diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index a4de552..ce458ae5 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -295,7 +295,7 @@ * to 0xFFFF, watchdog timeouts after about 64s. For details refer * to chapter 36 of the MPC5121e Reference Manual. */ -#define CONFIG_WATCHDOG /* enable watchdog */ +/* #define CONFIG_WATCHDOG */ /* enable watchdog */ #define CFG_WATCHDOG_VALUE 0xFFFF /* @@ -306,9 +306,9 @@ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ #ifdef CONFIG_CMD_KGDB - #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ + #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #else - #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ + #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #endif @@ -340,8 +340,8 @@ * * Boot Flags */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ +#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ +#define BOOTFLAG_WARM 0x02 /* Software reboot */ #ifdef CONFIG_CMD_KGDB #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ @@ -351,7 +351,7 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE +#define CONFIG_TIMESTAMP #define CONFIG_HOSTNAME ads5121 #define CONFIG_BOOTFILE ads5121/uImage diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index c5c2724..d8a2267 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -321,6 +321,12 @@ #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ + +#define CFG_HUSH_PARSER 1 /* Use the HUSH parser */ +#ifdef CFG_HUSH_PARSER +#define CFG_PROMPT_HUSH_PS2 "> " +#endif + #if defined(CONFIG_CMD_KGDB) #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #else |