diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-02-03 20:22:10 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-02-03 20:22:10 +0100 |
| commit | 111d6c6ad15d1425d3e5a678b2ff4b593e910fca (patch) | |
| tree | febbcf93318ed9265c4efef9b63c1a1249067d1f /include | |
| parent | 08254a1a9795711a6e43ad6e73d88a3988706731 (diff) | |
| parent | 4710cee1b5292fe077a67cc23193cc43060fbe3d (diff) | |
| download | blackbird-obmc-uboot-111d6c6ad15d1425d3e5a678b2ff4b593e910fca.tar.gz blackbird-obmc-uboot-111d6c6ad15d1425d3e5a678b2ff4b593e910fca.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/AR405.h | 1 | ||||
| -rw-r--r-- | include/configs/PMC440.h | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/configs/AR405.h b/include/configs/AR405.h index 73e34bdab2..52ead43aa4 100644 --- a/include/configs/AR405.h +++ b/include/configs/AR405.h @@ -93,6 +93,7 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_ELF #define CONFIG_CMD_MII +#undef CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_BSP diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 6310cfc339..89799af3f3 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -287,12 +287,8 @@ "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0" \ "addmisc=setenv bootargs ${bootargs} mem=${mem}\0" \ "nandargs=setenv bootargs root=/dev/mtdblock6 rootfstype=jffs2 rw\0" \ - "nand_boot=run nandargs addip addtty addmisc;bootm ${kernel_addr}\0" \ "nand_boot_fdt=run nandargs addip addtty addmisc;" \ "bootm ${kernel_addr} - ${fdt_addr}\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile};" \ - "run nfsargs addip addtty addmisc;" \ - "bootm\0" \ "net_nfs_fdt=tftp ${kernel_addr_r} ${bootfile};" \ "tftp ${fdt_addr_r} ${fdt_file};" \ "run nfsargs addip addtty addmisc;" \ @@ -353,7 +349,6 @@ #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_DTT -#define CONFIG_CMD_DIAG #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF #define CONFIG_CMD_FAT @@ -366,7 +361,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_USB #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_SDRAM /* POST support */ #define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \ |
