diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-08 10:51:53 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-08 10:51:53 +0100 |
| commit | 1ac14d8ea8c8421cd3328da254a79f46d0d2dd96 (patch) | |
| tree | 0d82174721d3a478fa53d6913611680c1948769a | |
| parent | 82afabfeb8ae6a27c7b396011ea99f4712aa73fa (diff) | |
| parent | 772003e43957ee0c895abed7cd82cbe72820cbb8 (diff) | |
| download | u-boot-imx-1ac14d8ea8c8421cd3328da254a79f46d0d2dd96.zip u-boot-imx-1ac14d8ea8c8421cd3328da254a79f46d0d2dd96.tar.gz u-boot-imx-1ac14d8ea8c8421cd3328da254a79f46d0d2dd96.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
| -rw-r--r-- | board/amcc/taihu/taihu.c | 2 | ||||
| -rw-r--r-- | include/configs/sequoia.h | 24 |
2 files changed, 18 insertions, 8 deletions
diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c index ea83671..eedde59 100644 --- a/board/amcc/taihu/taihu.c +++ b/board/amcc/taihu/taihu.c @@ -162,7 +162,7 @@ void spi_sda(int bit) unsigned char spi_read(void) { - return (unsigned char)gpio_read_out_bit(SPI_DIN_GPIO15); + return (unsigned char)gpio_read_in_bit(SPI_DIN_GPIO15); } void taihu_spi_chipsel(int cs) diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index cc910de..dfa8779 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2006-2007 + * (C) Copyright 2006-2008 * Stefan Roese, DENX Software Engineering, sr@denx.de. * * (C) Copyright 2006 @@ -254,11 +254,13 @@ /* Setup some board specific values for the default environment variables */ #ifndef CONFIG_RAINIER #define CONFIG_HOSTNAME sequoia -#define CFG_BOOTFILE "bootfile=/tftpboot/sequoia/uImage\0" +#define CFG_BOOTFILE "bootfile=sequoia/uImage\0" +#define CFG_DTBFILE "fdt_file=sequoia/sequoia.dtb\0" #define CFG_ROOTPATH "rootpath=/opt/eldk/ppc_4xxFP\0" #else #define CONFIG_HOSTNAME rainier -#define CFG_BOOTFILE "bootfile=/tftpboot/rainier/uImage\0" +#define CFG_BOOTFILE "bootfile=rainier/uImage\0" +#define CFG_DTBFILE "fdt_file=rainier/rainier.dtb\0" #define CFG_ROOTPATH "rootpath=/opt/eldk/ppc_4xx\0" #endif @@ -273,12 +275,20 @@ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ ":${hostname}:${netdev}:off panic=1\0" \ "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\ - "flash_nfs=run nfsargs addip addtty;" \ + "addmisc=setenv bootargs ${bootargs} mem=${mem}\0" \ + "flash_nfs=run nfsargs addip addtty addmisc;" \ "bootm ${kernel_addr}\0" \ - "flash_self=run ramargs addip addtty;" \ + "flash_self=run ramargs addip addtty addmisc;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ - "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ - "bootm\0" \ + "net_nfs=tftp 200000 ${bootfile};" \ + "run nfsargs addip addtty addmisc;" \ + "bootm\0" \ + "fdt_file=sequoia/sequoia.dtb\0" \ + "fdt_addr=400000\0" \ + "net_nfs_fdt=tftp 200000 ${bootfile};" \ + "tftp ${fdt_addr} ${fdt_file};" \ + "run nfsargs addip addtty addmisc;" \ + "bootm 200000 - ${fdt_addr}\0" \ "kernel_addr=FC000000\0" \ "ramdisk_addr=FC180000\0" \ "load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \ |