April 2008 - U-Boot

[U-Boot-Users] [PATCH V2] cfi-flash: Add CFG_FLASH_AUTOPROTECT_LIST
by Matthias Fuchs 25 Apr '08

25 Apr '08

This patch adds a configurable flash auto protection list that can be used to make U-Boot protect flash regions in flash_init(). The idea has been discussed on the u-boot mailing list starting on Nov 18th, 2007. Even this patch brings a new feature it is used as a bugfix for 4xx platforms where flash_init() does not completely protect the monitor's flash range in all situations. U-Boot protects the flash range from CFG_MONITOR_BASE to (CFG_MONITOR_BASE + monitor_flash_len - 1) by default. This does not include the reset vector at 0xfffffffc. Example: #define CFG_FLASH_AUTOPROTECT_LIST {{0xfff80000, 0x80000}} This config option will auto protect the last 512k of flash that contains the bootloader on board like APC405 and PMC405. Signed-off-by: Matthias Fuchs <matthias.fuchs(a)esd-electronics.com> --- drivers/mtd/cfi_flash.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index e3cfb8a..fad9e8b 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -169,6 +169,17 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* FLASH chips info */ #define CFG_FLASH_CFI_WIDTH FLASH_CFI_8BIT #endif +struct apl_s { + ulong start; + ulong size; +}; + +#if !defined(CFG_FLASH_AUTOPROTECT_LIST) +struct apl_s apl[] = {}; +#else +struct apl_s apl[] = CFG_FLASH_AUTOPROTECT_LIST; +#endif + typedef unsigned long flash_sect_t; /* CFI standard query structure */ @@ -1966,6 +1977,16 @@ unsigned long flash_init (void) CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, flash_get_info(CFG_ENV_ADDR_REDUND)); #endif + + for (i = 0; i < ARRAY_SIZE(apl); i++) { + debug ("autoprotecting from %08x to %08x\n", + apl[i].start, apl[i].start + apl[i].size - 1); + flash_protect (FLAG_PROTECT_SET, + apl[i].start, + apl[i].start + apl[i].size - 1, + flash_get_info (apl[i].start)); + } + return (size); } -- 1.5.3

3 3

[U-Boot-Users] [PATCH][RFC] lib_ppc: make the flush_cache stronger
by Dave Liu 25 Apr '08

25 Apr '08

Current flush_cache code does 1. clean the dcache with dcbst, but not invalidate dcache 2. invalidate icache This patch use the dcbf instead of dcbst to have stronger semantic, clean the dcache and invalidate dcache. Signed-off-by: Dave Liu <daveliu(a)freescale.com> --- To meet DMA safe operation on cache enabled system, such as DMA_TO_DEVICE/DMA_FROM_DEVICE/DMA_BIDIRECTIONAL We have two options: 1. Separate functions for them like linux kernel. A. clean dcache (dcbst) for DMA_TO_DEVICE B. invalidate dcache (dcbi) for DMA_FROM_DEVICE C. flush dcache (dcbf) for DMA_BIDIRECTIONAL. 2. Make current flush_cache stronger semanctic. use the dcbf instead of dcbst. Which one is better? or you have better option? Please suggest. Thanks, Dave lib_ppc/cache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_ppc/cache.c b/lib_ppc/cache.c index 27e1a82..f4039ba 100644 --- a/lib_ppc/cache.c +++ b/lib_ppc/cache.c @@ -34,9 +34,9 @@ void flush_cache (ulong start_addr, ulong size) for (addr = start_addr; addr < end_addr; addr += CFG_CACHELINE_SIZE) { - asm ("dcbst 0,%0": :"r" (addr)); + asm ("dcbf 0,%0": :"r" (addr)); } - asm ("sync"); /* Wait for all dcbst to complete on bus */ + asm ("sync"); /* Wait for all dcbf to complete on bus */ for (addr = start_addr; addr < end_addr; -- 1.5.4.rc4

3 5

[U-Boot-Users] [PATCH] 4xx: Add bootcount limit handling for APC405 boards
by Matthias Fuchs 25 Apr '08

25 Apr '08

Signed-off-by: Matthias Fuchs <matthias.fuchs(a)esd-electronics.com> --- board/esd/apc405/apc405.c | 7 ++++++- include/configs/APC405.h | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c index b663184..2cb743e 100644 --- a/board/esd/apc405/apc405.c +++ b/board/esd/apc405/apc405.c @@ -385,11 +385,16 @@ int misc_init_r(void) } out_be16((u16 *)(FUJI_BASE + LCDBL_PWM), 0xff); - if (getenv("usb_self") == NULL) { + /* + * fix environment for field updated units + */ + if (getenv("altbootcmd") == NULL) { setenv("usb_load", CFG_USB_LOAD_COMMAND); setenv("usbargs", CFG_USB_ARGS); setenv("bootcmd", CONFIG_BOOTCOMMAND); setenv("usb_self", CFG_USB_SELF_COMMAND); + setenv("bootlimit", CFG_BOOTLIMIT); + setenv("altbootcmd", CFG_ALT_BOOTCOMMAND); saveenv(); } diff --git a/include/configs/APC405.h b/include/configs/APC405.h index 5b04888..3402db9 100644 --- a/include/configs/APC405.h +++ b/include/configs/APC405.h @@ -48,6 +48,7 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTDELAY 1 /* autoboot after 3 seconds */ +#define CONFIG_BOOTCOUNT_LIMIT 1 #undef CONFIG_BOOTARGS @@ -57,6 +58,8 @@ "run ramargs addip addcon usbargs;" \ "bootm 200000 300000" #define CFG_USB_ARGS "setenv bootargs $(bootargs) usbboot=1" +#define CFG_BOOTLIMIT "3" +#define CFG_ALT_BOOTCOMMAND "run usb_self;reset" #define CONFIG_EXTRA_ENV_SETTINGS \ "hostname=abg405\0" \ @@ -88,8 +91,10 @@ "usb_load="CFG_USB_LOAD_COMMAND"\0" \ "usb_self="CFG_USB_SELF_COMMAND"\0" \ "usbargs="CFG_USB_ARGS"\0" \ + "bootlimit="CFG_BOOTLIMIT"\0" \ + "altbootcmd="CFG_ALT_BOOTCOMMAND"\0" \ "" -#define CONFIG_BOOTCOMMAND "run flash_self;run usb_self" +#define CONFIG_BOOTCOMMAND "run flash_self;reset" #define CONFIG_ETHADDR 00:02:27:8e:00:00 @@ -414,7 +419,12 @@ extern int flash_banks; #define CFG_INIT_RAM_END CFG_OCM_DATA_SIZE /* End of used area in RAM */ #define CFG_GBL_DATA_SIZE 128 /* reserved bytes for initial data */ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) -#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET +/* reserve some memory for BOOT limit info */ +#define CFG_INIT_SP_OFFSET (CFG_GBL_DATA_OFFSET - 16) + +#ifdef CONFIG_BOOTCOUNT_LIMIT /* reserve 2 word for bootcount limit */ +#define CFG_BOOTCOUNT_ADDR (CFG_GBL_DATA_OFFSET - 8) +#endif /* * Internal Definitions -- 1.5.3

2 3

[U-Boot-Users] Question about smc911x driver (16/32 Bit support)
by Jens Gehrlein 25 Apr '08

25 Apr '08

Hi, in the source code there is a preprocessor directive #error "SMC911X: Only 32-bit bus is supported". We use a LAN9215i, which has a 16 Bit data interface only, connected to an i.MX31. The LAN9215 is in the driver's ID list. According to the data sheet accesses have to be 2x16 Bit to build the device's internal 32 Bit format. What does this non-32-Bit exclusion exactly mean? Will the driver work on our HW configuration? Confused, Jens

3 6

[U-Boot-Users] [PATCH 0/2] Calculate image hashes with watchdog triggering
by Bartlomiej Sieka 25 Apr '08

25 Apr '08

Hash calculation of an image can be a time consuming operation, with the possibility of making the hardware watchdog (if present/enabled) expire in the middle. Add watchdog-aware hash calculation functions and make image hash calculation use them. --- Bartlomiej Sieka (2): Use watchdog-aware functions when calculating hashes of images Add support for calulacting hashes with watchdog triggering common/image.c | 43 +++++++++---------------------------------- include/common.h | 1 + include/image.h | 17 +++++++++++++++-- include/md5.h | 8 ++++++++ include/sha1.h | 11 +++++++++++ lib_generic/crc32.c | 28 ++++++++++++++++++++++++++++ lib_generic/md5.c | 40 ++++++++++++++++++++++++++++++++++++++++ lib_generic/sha1.c | 37 +++++++++++++++++++++++++++++++++++++ 8 files changed, 149 insertions(+), 36 deletions(-) -- Bartlomiej

2 13

[U-Boot-Users] u-boot on mpc852
by nikam_research＠ms.messung.com 25 Apr '08

25 Apr '08

Dear All, Can I use u-boot boot loader on mpc852 (powerPC)? I mean is already some patch is available ? ? ? Please acknowledge, thank you ... Kind Regards, Vijay Email Disclaimer: --------------------------- This e-mail and any files transmitted with it are for the sole use of the intended recipient(s) and may contain confidential and privileged information. Computer viruses can be transmitted via email.The recipient should check this email and any attachments for the presence of viruses. The company accepts no liability for any damage caused by any virus transmitted by this email. Using Symantec Hosted Mail Outbound Server

2 1

[U-Boot-Users] [PATCH] USB: fix more GCC 4.2.x aliasing warnings
by Wolfgang Denk 25 Apr '08

25 Apr '08

Signed-off-by: Wolfgang Denk <wd(a)denx.de> Acked-by: Markus Klotzbuecher <mk(a)denx.de> --- cpu/arm920t/s3c24x0/usb_ohci.c | 4 ++-- cpu/mpc5xxx/usb_ohci.c | 4 ++-- cpu/ppc4xx/usb_ohci.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cpu/arm920t/s3c24x0/usb_ohci.c b/cpu/arm920t/s3c24x0/usb_ohci.c index 4075f2e..96e43d0 100644 --- a/cpu/arm920t/s3c24x0/usb_ohci.c +++ b/cpu/arm920t/s3c24x0/usb_ohci.c @@ -58,8 +58,8 @@ #define OHCI_CONTROL_INIT \ (OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE -#define readl(a) (*((vu_long *)(a))) -#define writel(a, b) (*((vu_long *)(b)) = ((vu_long)a)) +#define readl(a) (*((volatile u32 *)(a))) +#define writel(a, b) (*((volatile u32 *)(b)) = ((volatile u32)a)) #define min_t(type,x,y) ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) diff --git a/cpu/mpc5xxx/usb_ohci.c b/cpu/mpc5xxx/usb_ohci.c index c774da3..2ad12b2 100644 --- a/cpu/mpc5xxx/usb_ohci.c +++ b/cpu/mpc5xxx/usb_ohci.c @@ -56,8 +56,8 @@ #define OHCI_CONTROL_INIT \ (OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE -#define readl(a) (*((vu_long *)(a))) -#define writel(a, b) (*((vu_long *)(b)) = ((vu_long)a)) +#define readl(a) (*((volatile u32 *)(a))) +#define writel(a, b) (*((volatile u32 *)(b)) = ((volatile u32)a)) #define min_t(type,x,y) ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) diff --git a/cpu/ppc4xx/usb_ohci.c b/cpu/ppc4xx/usb_ohci.c index c71a6a9..7dbb288 100644 --- a/cpu/ppc4xx/usb_ohci.c +++ b/cpu/ppc4xx/usb_ohci.c @@ -56,8 +56,8 @@ #define OHCI_CONTROL_INIT \ (OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE -#define readl(a) (*((vu_long *)(a))) -#define writel(a, b) (*((vu_long *)(b)) = ((vu_long)a)) +#define readl(a) (*((volatile u32 *)(a))) +#define writel(a, b) (*((volatile u32 *)(b)) = ((volatile u32)a)) #define min_t(type,x,y) ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) -- 1.5.4.2

1 0

[U-Boot-Users] [PATCH] lib_generic/crc32.c: add missing #include <watchdog.h>
by Wolfgang Denk 25 Apr '08

25 Apr '08

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- lib_generic/crc32.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 32e72f9..73070de 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -13,6 +13,7 @@ #else #include <stdint.h> #endif +#include <watchdog.h> #include "zlib.h" -- 1.5.4.2

1 0

[U-Boot-Users] [PATCH] lib_generic/crc32.c: fix compile problem
by Wolfgang Denk 25 Apr '08

25 Apr '08

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- lib_generic/crc32.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 58cd22e..32e72f9 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -151,10 +151,7 @@ const uint32_t * ZEXPORT get_crc_table() #define DO8(buf) DO4(buf); DO4(buf); /* ========================================================================= */ -uint32_t ZEXPORT crc32(crc, buf, len) - uint32_t crc; - const Bytef *buf; - uInt len; +uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len) { #ifdef DYNAMIC_CRC_TABLE if (crc_table_empty) @@ -203,7 +200,9 @@ uint32_t ZEXPORT crc32_no_comp(uint32_t crc, const Bytef *buf, uInt len) * Calculate the crc32 checksum triggering the watchdog every 'chunk_sz' bytes * of input. */ -ulong crc32_wd (ulong crc, const unsigned char *buf, uint len, uint chunk_sz) +uint32_t ZEXPORT crc32_wd (uint32_t crc, + const unsigned char *buf, + uInt len, uInt chunk_sz) { #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) const unsigned char *end, *curr; -- 1.5.4.2

1 0

[U-Boot-Users] [RFC] Implementing Boot Image Fallback on U-Boot
by Makito SHIOKAWA 25 Apr '08

25 Apr '08

Boot Image Fallback is a mechanism that enables a system to fallback to a "known good" boot image in the event of catastrophic boot failure (i.e. failure to boot, panic on boot, failure to initialize HW/SW). (CGL Availability Requirements Definition V4.0: AVL.9.0). On system especially used in telecommunication, 99.999% high availability is required. So, this function is highly needed (like my customer requires). This time, I'm thinking of implementing Boot Image Fallback on U-Boot as follows (like a way GRUB does). So, I would appreciate any comments to this. It uses new U-Boot command "bootmf" and fw_setenv. * bootmf It is a wrapper of "bootm", and it boots kernel with fallback enabled on multiple kernel images. Also, it uses new U-Boot environment variables as follows. * imgaddr<N> It holds physical address of flash partition that kernel image is written. <N> is integer and becomes an entry of corresponding kernel image. (ex.) imgaddr0=0xf8000000, imgaddr1=0xf8200000 * bootargs<N> It holds kernel parameter of entry <N>. (ex.) bootargs0=root=/dev/mtdblock1 , bootargs1=root=/dev/mtdblock3 * default It holds default entry that "bootmf" tries to boot on default. (ex.) default=1 * fallback It holds list of fallback entry that "bootmf" tries to boot on next if it fails to boot default entry. (ex.) fallback=1 2 Now, I assume that circumstances are as follows. (In my case, Linux on Freescale MPC8540.) * There are three flash partitions "kernel-0", "kernel-1", "kernel-2" that kernel images are written. * Environment variables are set as follows. bootcmd=bootmf imgaddr0=0xf8000000 (physical address of "kernel-0") imgaddr1=0xf8200000 (physical address of "kernel-1") imgaddr2=0xf8400000 (physical address of "kernel-2") bootargs0=root=/dev/mtdblock1 (rootfs of "kernel-0") bootargs1=root=/dev/mtdblock3 (rootfs of "kernel-1") bootargs2=root=/dev/mtdblock5 (rootfs of "kernel-2") default=0 fallback=1 2 * "fw_setenv default 0" is written to /etc/rc.local. Then it behaves as follows. 1. When U-Boot boots up, "bootmf" is executed and tries to boot default entry in "default". Before booting kernel, "bootmf" sets corresponding fallback entry in "fallback" to "default". ((ex.) When booting entry "0", "1" is set and when booting entry "1", "2" is set.) 2. If kernel succeeds to boot, "default" is set to "0" by fw_setenv. So, next time U-Boot boots up and "bootmf" is executed, entry "0" will be booted again. 3. If kernel fails to boot, "default" stays to fallback entry "1" because fw_setenv won't be executed. So, next time U-Boot boots and "bootmf" is executed, fallback entry "1" will be booted. By this way, Boot Image Fallback on U-Boot can be realized. I recognize that this needs to rewrite flash each time booting a kernel, but I think there won't be so many reboots once stable system operation have started. I'll write and send a prototype of "bootmf" if it is needed. Best regards, -- MIRACLE LINUX CORPORATION Makito SHIOKAWA

4 8