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 | |
| parent | 08254a1a9795711a6e43ad6e73d88a3988706731 (diff) | |
| parent | 4710cee1b5292fe077a67cc23193cc43060fbe3d (diff) | |
| download | u-boot-imx-111d6c6ad15d1425d3e5a678b2ff4b593e910fca.zip u-boot-imx-111d6c6ad15d1425d3e5a678b2ff4b593e910fca.tar.gz u-boot-imx-111d6c6ad15d1425d3e5a678b2ff4b593e910fca.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
| -rw-r--r-- | board/esd/plu405/plu405.c | 28 | ||||
| -rw-r--r-- | cpu/ppc4xx/traps.c | 1 | ||||
| -rw-r--r-- | include/configs/AR405.h | 1 | ||||
| -rw-r--r-- | include/configs/PMC440.h | 6 |
4 files changed, 30 insertions, 6 deletions
diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c index e385a78..0f7fa69 100644 --- a/board/esd/plu405/plu405.c +++ b/board/esd/plu405/plu405.c @@ -46,6 +46,34 @@ const unsigned char fpgadata[] = */ #include "../common/fpga.c" +/* + * generate a short spike on the CAN tx line + * to bring the couplers in sync + */ +void init_coupler(u32 addr) +{ + struct sja1000_basic_s *ctrl = (struct sja1000_basic_s *)addr; + + /* reset */ + out_8(&ctrl->cr, CR_RR); + + /* dominant */ + out_8(&ctrl->btr0, 0x00); /* btr setup is required */ + out_8(&ctrl->btr1, 0x14); /* we use 1Mbit/s */ + out_8(&ctrl->oc, OC_TP1 | OC_TN1 | OC_POL1 | + OC_TP0 | OC_TN0 | OC_POL0 | OC_MODE1); + out_8(&ctrl->cr, 0x00); + + /* delay */ + in_8(&ctrl->cr); + in_8(&ctrl->cr); + in_8(&ctrl->cr); + in_8(&ctrl->cr); + + /* reset */ + out_8(&ctrl->cr, CR_RR); +} + int board_early_init_f(void) { /* diff --git a/cpu/ppc4xx/traps.c b/cpu/ppc4xx/traps.c index cb35faf..42e4221 100644 --- a/cpu/ppc4xx/traps.c +++ b/cpu/ppc4xx/traps.c @@ -34,6 +34,7 @@ #include <common.h> #include <command.h> +#include <kgdb.h> #include <asm/processor.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/include/configs/AR405.h b/include/configs/AR405.h index 73e34bd..52ead43 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 6310cfc..89799af 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 | \ |