minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 03:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

Browse Source
This commit is contained in:
Wolfgang Denk 2008-03-08 10:51:53 +01:00
commit 1ac14d8ea8
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/amcc/taihu/taihu.c
View File

@ -162,7 +162,7 @@ void spi_sda(int bit)
unsigned char spi_read(void) 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) void taihu_spi_chipsel(int cs)

24
include/configs/sequoia.h
View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2006-2007 * (C) Copyright 2006-2008
* Stefan Roese, DENX Software Engineering, sr@denx.de. * Stefan Roese, DENX Software Engineering, sr@denx.de.
* *
* (C) Copyright 2006 * (C) Copyright 2006
@ -254,11 +254,13 @@
/* Setup some board specific values for the default environment variables */ /* Setup some board specific values for the default environment variables */
#ifndef CONFIG_RAINIER #ifndef CONFIG_RAINIER
#define CONFIG_HOSTNAME sequoia #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" #define CFG_ROOTPATH "rootpath=/opt/eldk/ppc_4xxFP\0"
#else #else
#define CONFIG_HOSTNAME rainier #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" #define CFG_ROOTPATH "rootpath=/opt/eldk/ppc_4xx\0"
#endif #endif
@ -273,12 +275,20 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off panic=1\0" \ ":${hostname}:${netdev}:off panic=1\0" \
"addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\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" \ "bootm ${kernel_addr}\0" \
"flash_self=run ramargs addip addtty;" \ "flash_self=run ramargs addip addtty addmisc;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ "net_nfs=tftp 200000 ${bootfile};" \
"bootm\0" \ "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" \ "kernel_addr=FC000000\0" \
"ramdisk_addr=FC180000\0" \ "ramdisk_addr=FC180000\0" \
"load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \ "load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \