January 2009 - U-Boot

[U-Boot] no flush_cache() call at the end of do_fat_fsload?
by Scott Coulter 29 Jan '09

29 Jan '09

Hi all, Maybe a stupid question, but does anyone no why there is no call to flush_cache() at the end of do_fat_fsload()? I haven't tried it on the latest u-boot, but I had an issue the other day where I was trying to load a VxWorks image from a Compact Flash card on a MPC8572-based board. The same image booted fine with tftpboot, but when I loaded the image off of the CF card using the fatload command, the image didn't boot. I confirmed that image was copied faithfully into DRAM. I then noticed that the tftpload command (netboot_common) has a call to flush_cache() after the download to memory completes, so I added the following to the end of do_fat_fsload(): ... /* flush cache */ flush_cache(offset, size); return 0; } Then the image booted... Thanks, Scott ___________________________________________________________________ Scott N. Coulter Senior Software Engineer Cyclone Microsystems 370 James Street Phone: 203.786.5536 ext. 118 New Haven, CT 06513-3051 Email: scott.coulter(a)cyclone.com U.S.A. Web: http://www.cyclone.com ___________________________________________________________________

2 1

[U-Boot] CompactFlash support for AT91SAM9263 microcontroller based customised board
by Ritesh Mehta 29 Jan '09

29 Jan '09

Is there any support for CompactFlash for AT91SAM9263 microcontroller based customised board in any version of u-boot ?

2 1

[U-Boot] AT91SAM9263 Board with DM9161A
by Josef Baumann 29 Jan '09

29 Jan '09

Hi, I designed a new AT91SAM9263 Board using the schematics of the Atmel AT91SAM9263-EK EVAL Board. I have a problem in the ethernet path. Running auto negotiation (Davicom DM9161A PHY) creates a connection with 100MBit/Half - Duplex. With the original Atmel Board Full duplex is possible. I tried this with U-Boot 2008/10 and Linux 2.6.24. TFTP from Host to our Board is ok, PING from Board to Host too, but not from Host to our Board. Reading back the auto-negotiation advertisment register (ANAR 0x04) shows 0x00a1, when writing 0x01c1 before. What's wrong? best regards Josef Baumann Prime Mess- und Regeltechnik Prinz-Eugen-Str. 65 94034 Passau Tel.: +49-851-41041 Fax.: +49-851-41042 web: www.prime-micro.de

1 0

[U-Boot] Establishing connection via Ethernet
by Piyush Shah 29 Jan '09

29 Jan '09

Hi all, Is it feasible to send u-boot commands via Ethernet instead of UART? I know that there is no such support right now. But can it be added? Moreover how am I supposed to transmit UDP or TCP packets from u-boot? -- -PIYUSH

3 3

[U-Boot] IP_t should be a "packed" struct
by Luigi 'Comio' Mantellini 29 Jan '09

29 Jan '09

Hi ML, I'm working on a mips target and I used qemu_mips target to simulate my target (that I hope to have in the next week...) Following my activities I noticed that IP_t structure is no defined with attribute "packed". I noticed this issue because using a self-made toolchain (gcc4.2.4+binutils2.8+uclibc0.9.30) the compiler has aligned all bytes to 32bit boundary. This is not ok, because the packets IP_t can be non aligned (see the /net/net.c PingSend function, for an example). The dirty solution is to define the structure with the __attribute__((__packed__))... but, from my point of view, a better packet forging mechanism should be implemented into the net.c stack. I attached a trivial patch that solved the issue on my target. Any comments is welcome. best regards, luigi -- Luigi Mantellini R&D - Software Industrie Dial Face S.p.A. Via Canzo, 4 20068 Peschiera Borromeo (MI), Italy Tel.: +39 02 5167 2813 Fax: +39 02 5167 2459 Email: luigi.mantellini(a)idf-hit.com

6 16

[U-Boot] [PATCH] jedec_flash: Only use manufacturer defines from common flash.h
by Stefan Roese 29 Jan '09

29 Jan '09

This patch removes the double defined manufacturer defines from jedec_flash.c. Since the common defines in flash.h are 32bit we now need the (16) cast. This patch also removes the compilation warning (e.g. seen on hcu5): ./MAKEALL hcu5 Configuring for hcu5 board... jedec_flash.c:219: warning: large integer implicitly truncated to unsigned type Signed-off-by: Stefan Roese <sr(a)denx.de> --- This patch replaces the patch "[PATCH] jedec_flash: Fix compilation warning in jedec_flash.c" sent on 2009-01-26. drivers/mtd/jedec_flash.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c index 2d99d4d..e48acec 100644 --- a/drivers/mtd/jedec_flash.c +++ b/drivers/mtd/jedec_flash.c @@ -37,10 +37,6 @@ #define P_ID_AMD_STD CFI_CMDSET_AMD_LEGACY -/* Manufacturers */ -#define MANUFACTURER_AMD 0x0001 -#define MANUFACTURER_SST 0x00BF - /* AMD */ #define AM29DL800BB 0x22CB #define AM29DL800BT 0x224A @@ -172,7 +168,7 @@ struct amd_flash_info { static const struct amd_flash_info jedec_table[] = { #ifdef CONFIG_SYS_FLASH_LEGACY_256Kx8 { - .mfr_id = MANUFACTURER_SST, + .mfr_id = (u16)SST_MANUFACT, .dev_id = SST39LF020, .name = "SST 39LF020", .uaddr = { @@ -188,7 +184,7 @@ static const struct amd_flash_info jedec_table[] = { #endif #ifdef CONFIG_SYS_FLASH_LEGACY_512Kx8 { - .mfr_id = MANUFACTURER_AMD, + .mfr_id = (u16)AMD_MANUFACT, .dev_id = AM29LV040B, .name = "AMD AM29LV040B", .uaddr = { @@ -202,7 +198,7 @@ static const struct amd_flash_info jedec_table[] = { } }, { - .mfr_id = MANUFACTURER_SST, + .mfr_id = (u16)SST_MANUFACT, .dev_id = SST39LF040, .name = "SST 39LF040", .uaddr = { @@ -216,7 +212,7 @@ static const struct amd_flash_info jedec_table[] = { } }, { - .mfr_id = STM_MANUFACT, + .mfr_id = (u16)STM_MANUFACT, .dev_id = STM_ID_M29W040B, .name = "ST Micro M29W040B", .uaddr = { @@ -232,7 +228,7 @@ static const struct amd_flash_info jedec_table[] = { #endif #ifdef CONFIG_SYS_FLASH_LEGACY_512Kx16 { - .mfr_id = MANUFACTURER_AMD, + .mfr_id = (u16)AMD_MANUFACT, .dev_id = AM29LV400BB, .name = "AMD AM29LV400BB", .uaddr = { @@ -249,7 +245,7 @@ static const struct amd_flash_info jedec_table[] = { } }, { - .mfr_id = MANUFACTURER_AMD, + .mfr_id = (u16)AMD_MANUFACT, .dev_id = AM29LV800BB, .name = "AMD AM29LV800BB", .uaddr = { -- 1.6.1.1.230.gdfb04

1 0

[U-Boot] [PATCH] ppc4xx: Clean up configuration file for Korat board
by Larry Johnson 29 Jan '09

29 Jan '09

This patch updates the default environmental variables for the Korat PPC 440EPx board, and makes additional minor fixes. Signed-off-by: Larry Johnson <lrj(a)acm.org> --- include/configs/korat.h | 84 ++++++++++++++++++++++++++++------------------- 1 files changed, 50 insertions(+), 34 deletions(-) diff --git a/include/configs/korat.h b/include/configs/korat.h index d56da14..eb2c1d4 100644 --- a/include/configs/korat.h +++ b/include/configs/korat.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007-2008 + * (C) Copyright 2007-2009 * Larry Johnson, lrj(a)acm.org * * (C) Copyright 2006-2007 @@ -138,15 +138,14 @@ /* * DDR SDRAM */ -#define CONFIG_SYS_MBYTES_SDRAM (512) /* 512 MiB TODO: remove */ #define CONFIG_DDR_DATA_EYE /* use DDR2 optimization */ #define CONFIG_SPD_EEPROM /* Use SPD EEPROM for setup */ #define CONFIG_ZERO_SDRAM /* Zero SDRAM after setup */ #define CONFIG_DDR_ECC /* Use ECC when available */ #define SPD_EEPROM_ADDRESS {0x50} #define CONFIG_PROG_SDRAM_TLB -#define CONFIG_SYS_MEM_TOP_HIDE (4 << 10) /* don't use last 4kbytes */ - /* 440EPx errata CHIP 11 */ +#define CONFIG_SYS_MEM_TOP_HIDE (4 << 10) /* don't use last 4 KiB as */ + /* per 440EPx Errata CHIP_11 */ /* * I2C @@ -173,42 +172,59 @@ #define CONFIG_SYS_DTT_MIN_TEMP -30 #define CONFIG_PREBOOT "echo;" \ - "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ + "echo Type \\\"run flash_cf\\\" to mount from CompactFlash(R);" \ "echo" #undef CONFIG_BOOTARGS /* Setup some board specific values for the default environment variables */ #define CONFIG_HOSTNAME korat -#define CONFIG_SYS_BOOTFILE "bootfile=/tftpboot/korat/uImage\0" -#define CONFIG_SYS_ROOTPATH "rootpath=/opt/eldk/ppc_4xxFP\0" /* Note: kernel_addr and ramdisk_addr assume that FLASH1 is 64 MiB. */ #define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_SYS_BOOTFILE \ - CONFIG_SYS_ROOTPATH \ + "u_boot=korat/u-boot.bin\0" \ + "load=tftp 200000 ${u_boot}\0" \ + "update=protect off F7F60000 F7FBFFFF;erase F7F60000 F7FBFFFF;" \ + "cp.b ${fileaddr} F7F60000 ${filesize};protect on " \ + "F7F60000 F7FBFFFF\0" \ + "upd=run load update\0" \ + "bootfile=korat/uImage\0" \ + "dtb=korat/korat.dtb\0" \ + "kernel_addr=F4000000\0" \ + "ramdisk_addr=F4400000\0" \ + "dtb_addr=F41E0000\0" \ + "udl=tftp 200000 ${bootfile}; erase F4000000 F41DFFFF; " \ + "cp.b ${fileaddr} F4000000 ${filesize}\0" \ + "udd=tftp 200000 ${dtb}; erase F41E0000 F41FFFFF; " \ + "cp.b ${fileaddr} F41E0000 ${filesize}\0" \ + "ll=setenv kernel_addr 200000; setenv dtb_addr 1000000; " \ + "tftp ${kernel_addr} ${uImage}; tftp ${dtb_addr} " \ + "${dtb}\0" \ + "rd_size=73728\0" \ + "ramargs=setenv bootargs root=/dev/ram rw " \ + "ramdisk_size=${rd_size}\0" \ + "usbdev=sda1\0" \ + "usbargs=setenv bootargs root=/dev/${usbdev} ro rootdelay=10\0" \ + "rootpath=/opt/eldk/ppc_4xxFP\0" \ "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath}\0" \ - "ramargs=setenv bootargs root=/dev/ram rw\0" \ + "pciclk=33\0" \ + "addide=setenv bootargs ${bootargs} ide=reverse " \ + "idebus=${pciclk}\0" \ "addip=setenv bootargs ${bootargs} " \ "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;" \ - "bootm ${kernel_addr}\0" \ - "flash_self=run ramargs addip addtty;" \ - "bootm ${kernel_addr} ${ramdisk_addr}\0" \ - "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ - "bootm\0" \ - "kernel_addr=F4000000\0" \ - "ramdisk_addr=F4400000\0" \ - "load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \ - "update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;" \ - "cp.b 200000 FFFA0000 60000\0" \ - "upd=run load update\0" \ + "flash_cf=run usbargs addide addip addtty; " \ + "bootm ${kernel_addr} - ${dtb_addr}\0" \ + "flash_nfs=run nfsargs addide addip addtty; " \ + "bootm ${kernel_addr} - ${dtb_addr}\0" \ + "flash_self=run ramargs addip addtty; " \ + "bootm ${kernel_addr} ${ramdisk_addr} ${dtb_addr}\0" \ "" -#define CONFIG_BOOTCOMMAND "run flash_self" + +#define CONFIG_BOOTCOMMAND "run flash_cf" #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ @@ -278,15 +294,15 @@ #define CONFIG_CMD_USB /* POST support */ -#define CONFIG_POST (CONFIG_SYS_POST_CACHE | \ - CONFIG_SYS_POST_CPU | \ - CONFIG_SYS_POST_ECC | \ - CONFIG_SYS_POST_ETHER | \ - CONFIG_SYS_POST_FPU | \ - CONFIG_SYS_POST_I2C | \ - CONFIG_SYS_POST_MEMORY | \ - CONFIG_SYS_POST_RTC | \ - CONFIG_SYS_POST_SPR | \ +#define CONFIG_POST (CONFIG_SYS_POST_CACHE | \ + CONFIG_SYS_POST_CPU | \ + CONFIG_SYS_POST_ECC | \ + CONFIG_SYS_POST_ETHER | \ + CONFIG_SYS_POST_FPU | \ + CONFIG_SYS_POST_I2C | \ + CONFIG_SYS_POST_MEMORY | \ + CONFIG_SYS_POST_RTC | \ + CONFIG_SYS_POST_SPR | \ CONFIG_SYS_POST_UART) #define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) @@ -403,7 +419,7 @@ * GPIO10 Alt1 O x PerCS5 to expansion bus connector * GPIO11 Alt1 I x PerErr * GPIO12 GPIO O 0 ATMega !Reset - * GPIO13 GPIO O 1 SPI Atmega !SS + * GPIO13 GPIO x x Test Point 2 (TP2) * GPIO14 GPIO O 1 Write protect EEPROM #1 (0xA8) * GPIO15 GPIO O 0 CPU Run LED !On * GPIO16 Alt1 O x GMC1TxD0 @@ -478,7 +494,7 @@ {GPIO0_BASE, GPIO_OUT, GPIO_ALT1, GPIO_OUT_0}, /* GPIO10 EBC_CS_N(5) */ \ {GPIO0_BASE, GPIO_IN , GPIO_ALT1, GPIO_OUT_0}, /* GPIO11 EBC_BUS_ERR */ \ {GPIO0_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_0}, /* GPIO12 */ \ -{GPIO0_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_1}, /* GPIO13 */ \ +{GPIO0_BASE, GPIO_DIS, GPIO_SEL , GPIO_OUT_0}, /* GPIO13 */ \ {GPIO0_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_1}, /* GPIO14 */ \ {GPIO0_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_0}, /* GPIO15 */ \ {GPIO0_BASE, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1}, /* GPIO16 GMCTxD(4) */ \

2 1

[U-Boot] [PATCH] ppc4xx: Add variable "korat_usbcf" for Korat board
by Larry Johnson 29 Jan '09

29 Jan '09

The new environment variable "korat_usbcf" selects the USB port used by the Korat board's CompactFlash controller. Signed-off-by: Larry Johnson <lrj(a)acm.org> --- board/korat/korat.c | 23 ++++++++++++++++++++++- doc/README.korat | 14 ++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/board/korat/korat.c b/board/korat/korat.c index 5ad75f7..8328ba3 100644 --- a/board/korat/korat.c +++ b/board/korat/korat.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007-2008 + * (C) Copyright 2007-2009 * Larry Johnson, lrj(a)acm.org * * (C) Copyright 2006-2007 @@ -351,6 +351,7 @@ int misc_init_r(void) unsigned long sdr0_pfc1; uint32_t const flash1_size = gd->bd->bi_flashsize - CONFIG_SYS_FLASH0_SIZE; char const *const act = getenv("usbact"); + char const *const usbcf = getenv("korat_usbcf"); /* * Re-do FLASH1 sizing and adjust flash start and offset. @@ -405,6 +406,26 @@ int misc_init_r(void) /* * USB suff... */ + /* + * Select the USB controller on the 440EPx ("ppc") or on the PCI bus + * ("pci") for the CompactFlash. + */ + if (usbcf != NULL && (strcmp(usbcf, "ppc") == 0)) { + /* + * If environment variable "usbcf" is defined and set to "ppc", + * then connect the CompactFlash controller to the PowerPC USB + * port. + */ + printf("Attaching CompactFalsh controller to PPC USB\n"); + out_8((u8 *) CONFIG_SYS_CPLD_BASE + 0x02, + in_8((u8 *) CONFIG_SYS_CPLD_BASE + 0x02) | 0x10); + } else { + if (usbcf != NULL && (strcmp(usbcf, "pci") != 0)) + printf("Warning: \"korat_usbcf\" is not set to a legal " + "value (\"ppc\" or \"pci\")\n"); + + printf("Attaching CompactFalsh controller to PCI USB\n"); + } if (act == NULL || strcmp(act, "hostdev") == 0) { /* SDR Setting */ mfsdr(SDR0_PFC1, sdr0_pfc1); diff --git a/doc/README.korat b/doc/README.korat index 0a59f40..49cd102 100644 --- a/doc/README.korat +++ b/doc/README.korat @@ -49,3 +49,17 @@ creates the upgradable U-Boot but selecting loader file "u-boot-F7FC.lds" and leaving preprocessor symbol "CONFIG_KORAT_PERMANENT" undefined. 2008-02-22, Larry Johnson <lrj(a)acm.org> + + + +The CompactFlash(R) controller on the Korat board provides a hi-speed USB +interface. This may be connected to either a dedicated port on the on-board +USB controller, or to a USB port on the PowerPC 440EPx processor. The U-Boot +environment variable "korat_usbcf" can be used to specify which of these two +USB host ports is used for CompactFlash. The valid setting for the variable are +the strings "pci" and "ppc". If the variable defined and set to "ppc", then the +PowerPC USB port is used. In all other cases the on-board USB controller is +used, but if "korat_usbcf" is defined but is set to a string other than the two +valid options, a warning is also issued. + +2009-01-28, Larry Johnson <lrj(a)acm.org>

2 1

[U-Boot] [PATCH 28/31] 8xx: add support for new keymile kmsupx4 board.
by Heiko Schocher 29 Jan '09

29 Jan '09

This patch adds support for the kmsupx4 board from Keymile, based on a Freescale MPC852T CPU - serial console on SMC1 - 32 MB SDRAM - 32 MB NOR Flash - Ethernet over SCC3 - I2C Bitbang Signed-off-by: Heiko Schocher <hs(a)denx.de> --- Makefile | 9 +++++- board/keymile/common/common.c | 6 +++- board/keymile/km8xx/km8xx.c | 7 ++++- cpu/mpc8xx/cpu_init.c | 2 + cpu/mpc8xx/start.S | 3 +- drivers/i2c/soft_i2c.c | 3 ++ include/commproc.h | 2 +- include/configs/keymile-common.h | 2 +- include/configs/km8xx.h | 54 ++++++++++++++++++++++++++++++------- lib_ppc/board.c | 3 +- 10 files changed, 73 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 70d60b5..9aaaf7a 100644 --- a/Makefile +++ b/Makefile @@ -921,6 +921,13 @@ IVMS8_config: unconfig } @$(MKCONFIG) -a IVMS8 ppc mpc8xx ivm +kmsupx4_config: unconfig + @mkdir -p $(obj)include + @{ echo "#define CONFIG_KMSUPX4" >>$(obj)include/config.h ; \ + $(XECHO) "kmsupx board configuration" ; \ + } + @$(MKCONFIG) -a km8xx ppc mpc8xx km8xx keymile + KUP4K_config : unconfig @$(MKCONFIG) $(@:_config=) ppc mpc8xx kup4k kup @@ -940,7 +947,7 @@ MBX860T_config: unconfig mgsuvd_config: unconfig @mkdir -p $(obj)include @{ echo "#define CONFIG_MGSUVD" >>$(obj)include/config.h ; \ - $(XECHO) "mgsuvd configuration" ; \ + $(XECHO) "mgsuvd board configuration" ; \ } @$(MKCONFIG) -a km8xx ppc mpc8xx km8xx keymile diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 1904482..3cf22a5 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -297,11 +297,14 @@ int ivm_analyze_eeprom (unsigned char *buf, int len) int ivm_read_eeprom (void) { +#if defined(CONFIG_I2C_MUX) I2C_MUX_DEVICE *dev = NULL; +#endif uchar i2c_buffer[CONFIG_SYS_IVM_EEPROM_MAX_LEN]; uchar *buf; unsigned dev_addr = CONFIG_SYS_IVM_EEPROM_ADR; +#if defined(CONFIG_I2C_MUX) /* First init the Bus, select the Bus */ #if defined(CONFIG_SYS_I2C_IVM_BUS) dev = i2c_mux_ident_muxstring ((uchar *)CONFIG_SYS_I2C_IVM_BUS); @@ -315,6 +318,7 @@ int ivm_read_eeprom (void) return -1; } i2c_set_bus_num (dev->busid); +#endif buf = (unsigned char *) getenv ("EEprom_ivm_addr"); if (buf != NULL) @@ -393,7 +397,7 @@ static void setports (int gpio) #endif #endif -#if defined(CONFIG_MGSUVD) +#if defined(CONFIG_MGSUVD) || defined(CONFIG_KMSUPX4) static void set_sda (int state) { I2C_SDA(state); diff --git a/board/keymile/km8xx/km8xx.c b/board/keymile/km8xx/km8xx.c index 02baf62..3f0e65f 100644 --- a/board/keymile/km8xx/km8xx.c +++ b/board/keymile/km8xx/km8xx.c @@ -61,7 +61,12 @@ const uint sdram_table[] = int checkboard (void) { - puts ("Board: Keymile mgsuvd"); + puts ("Board: Keymile "); +#if defined(CONFIG_KMSUPX4) + puts ("kmsupx4"); +#else + puts ("mgsuvd"); +#endif if (ethernet_present ()) puts (" with PIGGY."); puts ("\n"); diff --git a/cpu/mpc8xx/cpu_init.c b/cpu/mpc8xx/cpu_init.c index eb0091b..050008e 100644 --- a/cpu/mpc8xx/cpu_init.c +++ b/cpu/mpc8xx/cpu_init.c @@ -119,11 +119,13 @@ void cpu_init_f (volatile immap_t * immr) * Memory Controller: */ +#if !defined(CONFIG_KMSUPX4) /* perform BR0 reset that MPC850 Rev. A can't guarantee */ reg = memctl->memc_br0; reg &= BR_PS_MSK; /* Clear everything except Port Size bits */ reg |= BR_V; /* then add just the "Bank Valid" bit */ memctl->memc_br0 = reg; +#endif /* Map banks 0 (and maybe 1) to the FLASH banks 0 (and 1) at * preliminary addresses - these have to be modified later diff --git a/cpu/mpc8xx/start.S b/cpu/mpc8xx/start.S index 45c902e..7074f5d 100644 --- a/cpu/mpc8xx/start.S +++ b/cpu/mpc8xx/start.S @@ -142,7 +142,8 @@ boot_warm: lis r3, IDC_DISABLE@h /* Disable data cache */ mtspr DC_CST, r3 -#if !(defined(CONFIG_IP860) || defined(CONFIG_PCU_E) || defined (CONFIG_FLAGADM)) +#if !(defined(CONFIG_IP860) || defined(CONFIG_PCU_E) || \ + defined (CONFIG_FLAGADM) || defined(CONFIG_KMSUPX4)) /* On IP860 and PCU E, * we cannot enable IC yet */ diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index a27de5a..06d2da2 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -43,6 +43,9 @@ #ifdef CONFIG_MPC866 /* only valid for MPC866 */ #include <asm/io.h> #endif +#ifdef CONFIG_MPC852T /* only valid for MPC852T */ +#include <asm/io.h> +#endif #include <i2c.h> /* #define DEBUG_I2C */ diff --git a/include/commproc.h b/include/commproc.h index 12decfe..745642d 100644 --- a/include/commproc.h +++ b/include/commproc.h @@ -1126,7 +1126,7 @@ typedef struct scc_enet { /* The MGSUVD Service Module uses SCC3 for Ethernet */ -#ifdef CONFIG_MGSUVD +#if defined(CONFIG_MGSUVD) || defined(CONFIG_KMSUPX4) #define PROFF_ENET PROFF_SCC3 /* Ethernet on SCC3 */ #define CPM_CR_ENET CPM_CR_CH_SCC3 #define SCC_ENET 2 diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h index 80f9446..20f7bab 100644 --- a/include/configs/keymile-common.h +++ b/include/configs/keymile-common.h @@ -105,7 +105,7 @@ #define CONFIG_I2C_MUX 1 /* EEprom support */ -#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) +#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) || defined(CONFIG_KMSUPX4) #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #else #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/km8xx.h b/include/configs/km8xx.h index 9088d6a..0ab75b4 100644 --- a/include/configs/km8xx.h +++ b/include/configs/km8xx.h @@ -32,13 +32,21 @@ * High Level Configuration Options * (easy to change) */ - +#if defined(CONFIG_MGSUVD) #define CONFIG_MPC866 1 /* This is a MPC866 CPU */ #define CONFIG_HOSTNAME mgsuvd - +#else +#define CONFIG_MPC852T 1 /* This is a MPC852 CPU */ +#define CONFIG_HOSTNAME kmsupx4 +#endif + /* include common defines/options for all Keymile boards */ #include "keymile-common.h" +#if defined(CONFIG_KMSUPX4) +#undef CONFIG_I2C_MUX /* No I2C MUX on this board */ +#endif + #define CONFIG_8xx_GCLK_FREQ 66000000 #define CONFIG_SYS_SMC_UCODE_PATCH 1 /* Relocate SMC1 */ @@ -46,8 +54,10 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 +#if defined(CONFIG_MGSUVD) #define CONFIG_SYS_CPM_BOOTCOUNT_ADDR 0x1eb0 /* In case of SMC relocation, the * default value is not working */ +#endif #define CONFIG_PREBOOT "echo;" \ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ @@ -57,6 +67,11 @@ #define CONFIG_PRAM 512 /* protected RAM [KBytes] */ +#if defined(CONFIG_MGSUVD) +#define CONFIG_ENV_IVM "EEprom_ivm=pca9544a:70:4 \0" +#else +#define CONFIG_ENV_IVM "" +#endif #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ "rootpath=/opt/eldk/ppc_8xx\0" \ @@ -68,7 +83,7 @@ "2432k(rootfs1),640k(var),768k(cfg)\0" \ "partition=nor0,9 \0" \ "new_env=prot off F0060000 F009FFFF; era F0060000 F009FFFF \0" \ - "EEprom_ivm=pca9544a:70:4 \0" \ + CONFIG_ENV_IVM \ "" #undef CONFIG_RTC_MPC8xx /* MPC866 does not support RTC */ @@ -121,14 +136,10 @@ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_MAX_FLASH_SECT 256 /* max num of sects on one chip */ - -#define CONFIG_SYS_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ -#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ - -#define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_OFFSET CONFIG_SYS_MONITOR_LEN -#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment */ -#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_OFFSET CONFIG_SYS_MONITOR_LEN +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment */ +#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) @@ -155,7 +166,11 @@ * SIUMCR - SIU Module Configuration 11-6 *----------------------------------------------------------------------- */ +#if defined(CONFIG_MGSUVD) #define CONFIG_SYS_SIUMCR 0x00610480 +#else +#define CONFIG_SYS_SIUMCR 0x00610400 +#endif /*----------------------------------------------------------------------- * TBSCR - Time Base Status and Control 11-26 @@ -177,7 +192,11 @@ * Set clock output, timebase and RTC source and divider, * power management and some other internal clocks */ +#if defined(CONFIG_MGSUVD) #define SCCR_MASK 0x01800000 +#else +#define SCCR_MASK 0x00000000 +#endif #define CONFIG_SYS_SCCR 0x01800000 #define CONFIG_SYS_DER 0 @@ -219,7 +238,11 @@ #define CONFIG_SYS_MPTPR 0x0200 /* PTB=16, AMB=001, FIXME 1 RAS precharge cycles, 1 READ loop cycle (not used), 1 Write loop Cycle (not used), 1 Timer Loop Cycle */ +#if defined(CONFIG_MGSUVD) #define CONFIG_SYS_MBMR 0x10964111 +#else +#define CONFIG_SYS_MBMR 0x20964111 +#endif #define CONFIG_SYS_MAR 0x00000088 /* @@ -234,8 +257,13 @@ /* GPIO/PIGGY on CS3 initialization values */ #define CONFIG_SYS_PIGGY_BASE (0x30000000) +#if defined(CONFIG_MGSUVD) #define CONFIG_SYS_OR3_PRELIM (0xfe000d24) #define CONFIG_SYS_BR3_PRELIM (0x30000401) +#else +#define CONFIG_SYS_OR3_PRELIM (0xf8000d26) +#define CONFIG_SYS_BR3_PRELIM (0x30000401) +#endif /* * Internal Definitions @@ -292,7 +320,11 @@ /* I2C SYSMON (LM75, AD7414 is almost compatible) */ #define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ +#if defined(CONFIG_MGSUVD) #define CONFIG_DTT_SENSORS {0, 2, 4, 6} /* Sensor addresses */ +#else +#define CONFIG_DTT_SENSORS {0} /* Sensor addresses */ +#endif #define CONFIG_SYS_DTT_MAX_TEMP 70 #define CONFIG_SYS_DTT_LOW_TEMP -30 #define CONFIG_SYS_DTT_HYSTERESIS 3 diff --git a/lib_ppc/board.c b/lib_ppc/board.c index 61c29b5..4ad0234 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -753,7 +753,8 @@ void board_init_r (gd_t *id, ulong dest_addr) WATCHDOG_RESET(); #if defined(CONFIG_IP860) || defined(CONFIG_PCU_E) || \ - defined (CONFIG_FLAGADM) || defined(CONFIG_MPC83XX) + defined (CONFIG_FLAGADM) || defined(CONFIG_MPC83XX) || \ + defined(CONFIG_KMSUPX4) icache_enable (); /* it's time to enable the instruction cache */ #endif -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 2

[U-Boot] [PATCH 22/31] mpc83xx, kmeter1, mtd: set the default partition table
by Heiko Schocher 29 Jan '09

29 Jan '09

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/configs/kmeter1.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index d66ba8b..feb6150 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -322,6 +322,11 @@ #define CONFIG_SYS_DTT_BUS_NUM (2) #define CONFIG_SYS_DTT_BOARD_INIT 1 +#define MTDIDS_DEFAULT "nor0=app" +#define MTDPARTS_DEFAULT ( \ + "mtdparts=app:256k(u-boot),128k(env),128k(envred)," \ + "1536k(esw0),8704k(rootfs0),1536k(esw1),2432k(rootfs1),640k(var),768k(cfg)") + #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI #endif @@ -448,6 +453,10 @@ "ramdisk_addr_r=F10000\0" \ "EEprom_ivm=pca9547:70:9\0" \ "DTT_bus=pca9547:70:a\0" \ + "mtdids=nor0=app \0" \ + "mtdparts=mtdparts=app:256k(u-boot),128k(env),128k(envred)," \ + "1536k(esw0),8704k(rootfs0),1536k(esw1)," \ + "2432k(rootfs1),640k(var),768k(cfg)\0" \ "" -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

3 3