January 2009 - U-Boot

[U-Boot] 405EP U-boot/Linux Question (CFG_OCM_DATA_ADDR)
by Pawel Pastuszak 29 Jan '09

29 Jan '09

Hi guys, I was wondering if some one could give me an hand with OCM for PPC405EP So my goal is to Access *CFG_BOOTCOUNT_ADDR *value in Linux based on http://www.denx.de/wiki/view/DULG/UBootBootCountLimit In u-boot it works fine but ... but how to i talk to this memory range in linux. I tried the following but no luck. ulong * save_addr = ioremap( (CFG_OCM_DATA_ADDR + CFG_BOOTCOUNT_ADDR),8 ); if (save_addr[1] != BOOTCOUNT_MAGIC) return 0; else return save_addr[0]; u-boot config file setting: #define *CFG_OCM_DATA_ADDR* 0xF8000000 #define CFG_OCM_DATA_SIZE 0x1000 #define CFG_INIT_RAM_ADDR CFG_OCM_DATA_ADDR /* inside of OCM */ #define CFG_INIT_RAM_END CFG_OCM_DATA_SIZE /* End of used area in RAM */ #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) /* reserve some memory for POST and BOOT limit info */ #define CFG_INIT_SP_OFFSET (CFG_GBL_DATA_OFFSET - 24) /* extra data in OCM */ #define CFG_POST_WORD_ADDR (CFG_GBL_DATA_OFFSET - 4) #define CFG_POST_MAGIC (CFG_OCM_DATA_ADDR + CFG_GBL_DATA_OFFSET - 8) #define CFG_POST_VAL (CFG_OCM_DATA_ADDR + CFG_GBL_DATA_OFFSET - 12) #ifdef CONFIG_BOOTCOUNT_LIMIT /* reserve 2 word for bootcount limit */ #define CFG_BOOTCOUNT_ADDR (CFG_GBL_DATA_OFFSET - 24) //#define *CFG_BOOTCOUNT_ADDR* (CFG_OCM_DATA_ADDR + CFG_GBL_DATA_OFFSET - 16) #endif Any suggestion?

2 1

[U-Boot] [PATCH v2] Add 16bpp BMP support
by Mark Jackson 29 Jan '09

29 Jan '09

This patch adds 16bpp BMP support to the common lcd code. At the moment it's only been tested on the MIMC200 AVR32 board, but the hooks are in place to extend this to other platforms. Signed-off-by: Mark Jackson <mpfj(a)mimc.co.uk> --- common/lcd.c | 55 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 10 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index ae79051..8cbb540 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -84,7 +84,7 @@ extern void lcd_enable (void); static void *lcd_logo (void); -#if LCD_BPP == LCD_COLOR8 +#if (LCD_BPP == LCD_COLOR8) || (LCD_BPP == LCD_COLOR16) extern void lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue); #endif @@ -656,7 +656,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) bpix = NBITS(panel_info.vl_bpix); - if ((bpix != 1) && (bpix != 8)) { + if ((bpix != 1) && (bpix != 8) && (bpix != 16)) { printf ("Error: %d bit/pixel mode not supported by U-Boot\n", bpix); return 1; @@ -738,17 +738,52 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) bmap = (uchar *)bmp + le32_to_cpu (bmp->header.data_offset); fb = (uchar *) (lcd_base + (y + height - 1) * lcd_line_length + x); - for (i = 0; i < height; ++i) { - WATCHDOG_RESET(); - for (j = 0; j < width ; j++) + + switch (bpix) { + case 1: /* pass through */ + case 8: + for (i = 0; i < height; ++i) { + WATCHDOG_RESET(); + for (j = 0; j < width ; j++) #if defined(CONFIG_PXA250) || defined(CONFIG_ATMEL_LCD) - *(fb++) = *(bmap++); + *(fb++) = *(bmap++); #elif defined(CONFIG_MPC823) || defined(CONFIG_MCC200) - *(fb++)=255-*(bmap++); + *(fb++)=255-*(bmap++); #endif - bmap += (width - padded_line); - fb -= (width + lcd_line_length); - } + bmap += (width - padded_line); + fb -= (width + lcd_line_length); + } + break; + +#if defined(CONFIG_PXA250) +#error 16 bpp support not added for PXA250 +#elif defined(CONFIG_ATMEL_LCD) + case 16: + for (i = 0; i < height; ++i) { + WATCHDOG_RESET(); + for (j = 0; j < width; j++) { +#if defined(CONFIG_ATMEL_LCD_BGR555) + *(fb++) = ((bmap[0] & 0x1f) << 2) | (bmap[1] & 0x03); + *(fb++) = (bmap[0] & 0xe0) | ((bmap[1] & 0x7c) >> 2); + bmap += 2; +#else + *(fb++) = *(bmap++); + *(fb++) = *(bmap++); +#endif + } + bmap += (padded_line - width) * 2; + fb -= (width * 2 + lcd_line_length); + } + break; +#elif defined(CONFIG_MPC823) +#error 16 bpp support not added for MPC823 +#elif defined(CONFIG_MCC200) +#error 16 bpp support not added for MCC200 +#endif + + default: + break; + }; return (0); }

7 13

[U-Boot] Coldfire: Compiler warnings when building M5271EVB
by Richard Retanubun 29 Jan '09

29 Jan '09

Tsi-Chung: Sorry for the delay. I've posted the M5271 patches to the mailing list just now. Also, I have a question about the compiler warning I see when building the M5271EVB: cpu_init.c:57:2: warning: #warning "Chip Select 0 are not initialized/used" cpu_init.c: In function 'init_fbcs': cpu_init.c:49: warning: unused variable 'fbcs' The line numbers are AFTER my patches, so they may not match yours precisely. Is the correct answer to add CONFIG_M5271 to the this #ifndef ? - #ifndef CONFIG_M5272 + #if !(defined CONFIG_M5272) && !(defined CONFIG_M5271) /* Only 5272 Flexbus chipselect is different from the rest */ void init_fbcs(void) { I think that will remove the warnings for M5271, but I may be missing the context here :) what is the flexBus by the way? Thanks for the time - Richard Retanubun

2 2

[U-Boot] [PATCH] mpc83xx: fix undefined reference to `flush_cache' error in simpc8313 build
by Kim Phillips 28 Jan '09

28 Jan '09

extend commit c70564e6b1bd08f3230182392238907f3531a87e "NAND: Fix cache and memory inconsistency issue" to add the cache.o dependency to the simpc8313 build and fix this: ...Large Page NAND...Configuring for SIMPC8313 board... nand_boot_fsl_elbc.o: In function `nand_boot': nand_spl/board/sheldon/simpc8313/nand_boot_fsl_elbc.c:150: undefined reference to `flush_cache' make[1]: *** [/home/r1aaha/git/u-boot-mpc83xx/nand_spl/u-boot-spl] Error 1 make: *** [nand_spl] Error 2 Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- Ron, if you ack/confirm this doesn't break your board, I'll apply this to u-boot-mpc83xx. Thanks, Kim nand_spl/board/sheldon/simpc8313/Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile index b0967a3..416e176 100644 --- a/nand_spl/board/sheldon/simpc8313/Makefile +++ b/nand_spl/board/sheldon/simpc8313/Makefile @@ -34,7 +34,8 @@ AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL SOBJS = start.o ticks.o -COBJS = nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o nand_init.o time.o +COBJS = nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o nand_init.o \ + time.o cache.o SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c)) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) @@ -78,6 +79,9 @@ $(obj)ns16550.c: $(obj)nand_init.c: ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $< +$(obj)cache.c: + ln -sf $(SRCTREE)/lib_ppc/cache.c $< + $(obj)time.c: ln -sf $(SRCTREE)/lib_ppc/time.c $< -- 1.6.1

4 8

[U-Boot] proper changelog formatting
by Mike Frysinger 28 Jan '09

28 Jan '09

Michael: could you make sure your patch changelogs follow proper git style in the future ? these two commits have broken formatting with the subject and so look messed up when looking at short history: 51ab142b8b546d5e627b2c8c36d0adae222565f7 db63299b1dd2894ade542278210bccd046de6435 -mike

1 0

[U-Boot] [PATCH v2] 85xx: Fix compile breakage with sbc8540 and sbc8560
by Wolfgang Denk 28 Jan '09

28 Jan '09

This fixes an error which raises just a warning: sbc8560.c:250: warning: passing argument 2 of 'strmhz' makes integer from pointer without a cast Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- v2: fix typo in Subject board/sbc8560/sbc8560.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/sbc8560/sbc8560.c b/board/sbc8560/sbc8560.c index 3d4008b..7f032c8 100644 --- a/board/sbc8560/sbc8560.c +++ b/board/sbc8560/sbc8560.c @@ -247,7 +247,7 @@ int checkboard (void) #else printf ("Board: Wind River SBC8540 Board\n"); #endif - printf ("\tCPU: %s MHz\n", strmhz(buf, sysinfo.freqProcessor)); + printf ("\tCPU: %s MHz\n", strmhz(buf, sysinfo.freqProcessor[0])); printf ("\tCCB: %s MHz\n", strmhz(buf, sysinfo.freqSystemBus)); printf ("\tDDR: %s MHz\n", strmhz(buf, sysinfo.freqSystemBus/2)); if((CONFIG_SYS_LBC_LCRR & 0x0f) == 2 || (CONFIG_SYS_LBC_LCRR & 0x0f) == 4 \ -- 1.6.0.6

1 0

[U-Boot] [PATCH] 85xx: Fix compile breakage with sbc850 and sbc8560
by Wolfgang Denk 28 Jan '09

28 Jan '09

This fixes an error which raises just a warning: sbc8560.c:250: warning: passing argument 2 of 'strmhz' makes integer from pointer without a cast Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/sbc8560/sbc8560.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/sbc8560/sbc8560.c b/board/sbc8560/sbc8560.c index 3d4008b..7f032c8 100644 --- a/board/sbc8560/sbc8560.c +++ b/board/sbc8560/sbc8560.c @@ -247,7 +247,7 @@ int checkboard (void) #else printf ("Board: Wind River SBC8540 Board\n"); #endif - printf ("\tCPU: %s MHz\n", strmhz(buf, sysinfo.freqProcessor)); + printf ("\tCPU: %s MHz\n", strmhz(buf, sysinfo.freqProcessor[0])); printf ("\tCCB: %s MHz\n", strmhz(buf, sysinfo.freqSystemBus)); printf ("\tDDR: %s MHz\n", strmhz(buf, sysinfo.freqSystemBus/2)); if((CONFIG_SYS_LBC_LCRR & 0x0f) == 2 || (CONFIG_SYS_LBC_LCRR & 0x0f) == 4 \ -- 1.6.0.6

1 0

[U-Boot] [PATCH 0/5 v2] Command usage cleanup
by Peter Tyser 28 Jan '09

28 Jan '09

2 8

[U-Boot] [PATCH] saveenv: standardize enablement
by Mike Frysinger 28 Jan '09

28 Jan '09

Rather than special casing each environment type for enabling the saveenv command, have them all behave the same. This avoids bitrot as new env sources are added/removed. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- common/cmd_nvedit.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 85025da..b93de13 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -546,11 +546,8 @@ int getenv_r (char *name, char *buf, unsigned len) return (-1); } -#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \ - || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ - || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \ - || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \ - && !defined(CONFIG_ENV_IS_NOWHERE)) +#if defined(CONFIG_CMD_ENV) && !defined(CONFIG_ENV_IS_NOWHERE) + int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { extern char * env_name_spec; @@ -560,6 +557,12 @@ int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return (saveenv() ? 1 : 0); } +U_BOOT_CMD( + saveenv, 1, 0, do_saveenv, + "saveenv - save environment variables to persistent storage\n", + NULL +); + #endif @@ -602,19 +605,6 @@ U_BOOT_CMD( " - delete environment variable 'name'\n" ); -#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \ - || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ - || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \ - || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \ - && !defined(CONFIG_ENV_IS_NOWHERE)) -U_BOOT_CMD( - saveenv, 1, 0, do_saveenv, - "saveenv - save environment variables to persistent storage\n", - NULL -); - -#endif - #if defined(CONFIG_CMD_ASKENV) U_BOOT_CMD( -- 1.6.0.6

2 9

[U-Boot] [PATCH 30/31] 8xx, km8xx: update in dts node "flash", the reg value correct.
by Heiko Schocher 28 Jan '09

28 Jan '09

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- board/keymile/km8xx/km8xx.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/board/keymile/km8xx/km8xx.c b/board/keymile/km8xx/km8xx.c index 3f0e65f..a117845 100644 --- a/board/keymile/km8xx/km8xx.c +++ b/board/keymile/km8xx/km8xx.c @@ -173,6 +173,7 @@ void ft_blob_update (void *blob, bd_t *bd) ulong brg_data[1] = {0}; ulong memory_data[2] = {0}; ulong flash_data[4] = {0}; + ulong flash_reg[3] = {0}; memory_data[0] = cpu_to_be32 (bd->bi_memstart); memory_data[1] = cpu_to_be32 (bd->bi_memsize); @@ -184,6 +185,10 @@ void ft_blob_update (void *blob, bd_t *bd) fdt_set_node_and_value (blob, "/localbus", "ranges", flash_data, sizeof (flash_data)); + flash_reg[2] = cpu_to_be32 (bd->bi_flashsize); + fdt_set_node_and_value (blob, "/localbus/flash@0,0", "reg", flash_reg, + sizeof (flash_reg)); + /* BRG */ brg_data[0] = cpu_to_be32 (bd->bi_busfreq); fdt_set_node_and_value (blob, "/soc/cpm", "brg-frequency", brg_data, -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1