February 2008 - U-Boot

[U-Boot-Users] [PATCH] Add 'imload' command
by Kumar Gala 15 Feb '08

15 Feb '08

'imload' provides a more direct means to load from an image file. Also created a load_image routine out of the code in do_bootm() that is shared between do_bootm() and do_imload(). Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- Note, this is against the u-boot-testing new-image branch. common/cmd_bootm.c | 180 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 133 insertions(+), 47 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 2ddb191..0211b86 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -112,6 +112,58 @@ static boot_os_fn do_bootm_artos; ulong load_addr = CFG_LOAD_ADDR; /* Default Load Address */ +int load_image(image_header_t *hdr, ulong img_data, ulong img_len, ulong dst) +{ + const char *type_name; + uint unc_len = CFG_BOOTM_LEN; + ulong end = 0; + + type_name = image_get_type_name (image_get_type (hdr)); + + switch (image_get_comp (hdr)) { + case IH_COMP_NONE: + if (dst == (ulong)hdr) { + printf (" XIP %s ... ", type_name); + } else { + printf (" Loading %s ... ", type_name); + + memmove_wd ((void *)dst, (void *)img_data, + img_len, CHUNKSZ); + + end = dst + img_len; + } + break; + case IH_COMP_GZIP: + printf (" Uncompressing %s ... ", type_name); + if (gunzip ((void *)dst, unc_len, + (uchar *)img_data, &img_len) != 0) + return -1; + + end = dst + img_len; + break; +#ifdef CONFIG_BZIP2 + case IH_COMP_BZIP2: + printf (" Uncompressing %s ... ", type_name); + /* + * If we've got less than 4 MB of malloc() space, + * use slower decompression algorithm which requires + * at most 2300 KB of memory. + */ + if (BZ2_bzBuffToBuffDecompress ((char*)dst, + &unc_len, (char *)img_data, img_len, + CFG_MALLOC_LEN < (4096 * 1024), 0) != BZ_OK) + return -1; + + end = dst + unc_len; + break; +#endif /* CONFIG_BZIP2 */ + default: + return -2; + } + + puts ("OK\n"); + return end; +} /*******************************************************************/ /* bootm - boot application image from image in memory */ @@ -120,7 +172,6 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { ulong iflag; const char *type_name; - uint unc_len = CFG_BOOTM_LEN; int verify = getenv_verify(); image_header_t *hdr; @@ -160,61 +211,23 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) image_start = (ulong)hdr; image_end = image_get_image_end (hdr); load_start = image_get_load (hdr); - load_end = 0; - switch (image_get_comp (hdr)) { - case IH_COMP_NONE: - if (image_get_load (hdr) == (ulong)hdr) { - printf (" XIP %s ... ", type_name); - } else { - printf (" Loading %s ... ", type_name); - - memmove_wd ((void *)image_get_load (hdr), - (void *)os_data, os_len, CHUNKSZ); - - load_end = load_start + os_len; - puts("OK\n"); - } - break; - case IH_COMP_GZIP: - printf (" Uncompressing %s ... ", type_name); - if (gunzip ((void *)image_get_load (hdr), unc_len, - (uchar *)os_data, &os_len) != 0) { - puts ("GUNZIP ERROR - must RESET board to recover\n"); - show_boot_progress (-6); - do_reset (cmdtp, flag, argc, argv); - } + load_end = load_image(hdr, os_data, os_len, load_start); - load_end = load_start + os_len; - break; -#ifdef CONFIG_BZIP2 - case IH_COMP_BZIP2: - printf (" Uncompressing %s ... ", type_name); - /* - * If we've got less than 4 MB of malloc() space, - * use slower decompression algorithm which requires - * at most 2300 KB of memory. - */ - int i = BZ2_bzBuffToBuffDecompress ((char*)image_get_load (hdr), - &unc_len, (char *)os_data, os_len, - CFG_MALLOC_LEN < (4096 * 1024), 0); - if (i != BZ_OK) { - printf ("BUNZIP2 ERROR %d - must RESET board to recover\n", i); - show_boot_progress (-6); - do_reset (cmdtp, flag, argc, argv); - } + if (load_end == -1) { + printf("%s ERROR - must RESET board to recover\n", type_name); + show_boot_progress (-6); + do_reset (cmdtp, flag, argc, argv); + } - load_end = load_start + unc_len; - break; -#endif /* CONFIG_BZIP2 */ - default: + if (load_end == -2) { if (iflag) enable_interrupts(); printf ("Unimplemented compression type %d\n", image_get_comp (hdr)); show_boot_progress (-7); return 1; } - puts ("OK\n"); + debug (" kernel loaded at 0x%08lx, end = 0x%08lx\n", load_start, load_end); show_boot_progress (7); @@ -482,6 +495,79 @@ U_BOOT_CMD( ); #endif +/*******************************************************************/ +/* imload - load image file */ +/*******************************************************************/ +#if defined(CONFIG_CMD_IMLOAD) +int do_imload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + ulong addr = load_addr; + int end; + int verify = getenv_verify(); + char buf[12]; + image_header_t *h; + + if (argc > 1) + addr = simple_strtoul(argv[1], NULL, 16); + + h = (image_header_t *)addr; + + if (!image_check_magic (h)) { + puts (" Bad Magic Number\n"); + return 1; + } + + if (!image_check_hcrc (h)) { + puts (" Bad Header Checksum\n"); + return 1; + } + + print_image_hdr(h); + + if (verify) { + puts (" Verifying Checksum ... "); + if (!image_check_dcrc (h)) { + printf ("Bad Data CRC\n"); + return 1; + } + puts ("OK\n"); + } + + if (argc == 3) + addr = simple_strtoul(argv[2], NULL, 16); + else + addr = image_get_load(h); + + printf("\n Loading image at %08x\n", addr); + + end = load_image(h, image_get_data(h), image_get_data_size(h), addr); + + if (end > 0) { + sprintf(buf, "%lX", addr); + setenv("fileaddr", buf); + sprintf(buf, "%lX", end - addr); + setenv("filesize", buf); + return 0; + } + + if (end == -1) + puts("\n Decompression Error\n"); + + return 1; +} + +U_BOOT_CMD( + imload, 3, 1, do_imload, + "imload - load image from application image\n", + "[addr] [load addr]\n" + " - load image from application image located at address 'addr'\n" + " or $loadaddr if 'addr' is not provided to either the load\n" + " address specified in the application image header or the\n" + " 'load addr' argument; this includes verification of the\n" + " image contents (magic number, header and payload checksums)\n" +); +#endif + /*******************************************************************/ /* imls - list all images found in flash */ -- 1.5.3.8

5 17

[U-Boot-Users] Sandeep added you as a friend on WAYN
by WAYN.com 15 Feb '08

15 Feb '08

Hi u-boot-users <@@MEMBER_NAME> added you as a friend on WAYN (Where Are You Now?). To confirm that you are friends and join the worlds' largest travel and lifestyle community, click on the following link: http://www.wayn.com/waynfx.html?wci=link&id=1445&mks=<@@MEMBERS_KEYS>&mx=<@@MX>&cx=<@@CX>&cx_token=<@@CX_TOKEN> WAYN has changed for the better and is now free to chat, share, search and join. You also have 3 unread messages Regards, WAYN This invitation was sent to <@@CONTACT_EMAIL> on behalf of <@@MEMBER_NAME> If you do not wish to receive invitations from <@@MEMBER_NAME>, click here (http://www.wayn.com/waynfx.html?wci=link&id=1446&mkeys=<@@MEMBERS_KEYS>&hash=<@@BLOCK_HASH>) If you do not wish to receive invitations from any members, click here (http://www.wayn.com/waynfx.html?wci=link&id=1447&code=<@@CONTACT_EMAIL_HASH>&cm=<@@CAMPAIGN_KEY>)

1 0

[U-Boot-Users] Query about U-Boot NAND ENV section
by Hiremath, Vaibhav 15 Feb '08

15 Feb '08

Hi, I am using U-Boot 1.2.0 release of U-Boot and working on ARM1176 platform. I have ported U-Boot for my platform, which boots from NAND Flash, save ENV variable onto NAND Flash. Almost everything works fine for me till now. But today I came across one issue - When I set baudrate to different value from U-Boot prompt, and do a "saveenv", and after that if I reboot the system it should boot with new baudrate set. Ideally it should take new baudrate, but it always configures default baudrate. I tried to dig into this issue, and found that, U-Boot for NAND Flash is designed the same way. The function "nand_init" gets invoked after "env_init" and "serial_init", and sue to this U-Boot always uses the default baudrate. Do I understand it correctly? Is there any way to resolve this issue? Thanks, Vaibhav

2 1

[U-Boot-Users] new-image allocation mechanism
by Kumar Gala 15 Feb '08

15 Feb '08

Guys, Look at the code in the branch I was wondering what your feeling was about changing things around a bit with regards to allocation mechanisms. My thinking is that when we call do_bootm_linux() what ever the end of the kernel is we should start allocating from there towards the end of memory rather than from the "stack" down towards 0. I think this would greatly simplify things for us. - k

1 0

[U-Boot-Users] [PATCH 3/3] [new uImage] ppc: Re-order ramdisk/fdt handling sequence
by Kumar Gala 15 Feb '08

15 Feb '08

Do the fdt before the ramdisk allows us to grow the fdt w/o concern however it does me we have to go in and fixup the initrd info since we dont know where it will be. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- Patch against u-boot-testing new-image branch. lib_ppc/bootm.c | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index 5158ccc..927842c 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -121,9 +121,6 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, rd_len = rd_data_end - rd_data_start; - alloc_current = ramdisk_high (alloc_current, rd_data_start, rd_len, - sp_limit, get_sp (), &initrd_start, &initrd_end); - #if defined(CONFIG_OF_LIBFDT) /* find flattened device tree */ alloc_current = get_fdt (alloc_current, @@ -134,7 +131,8 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, * if the user wants it (the logic is in the subroutines). */ if (of_flat_tree) { - if (fdt_chosen(of_flat_tree, initrd_start, initrd_end, 0) < 0) { + /* pass in dummy initrd info, we'll fix up later */ + if (fdt_chosen(of_flat_tree, rd_data_start, rd_data_end, 0) < 0) { fdt_error ("/chosen node create failed"); do_reset (cmdtp, flag, argc, argv); } @@ -157,6 +155,38 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, } #endif /* CONFIG_OF_LIBFDT */ + alloc_current = ramdisk_high (alloc_current, rd_data_start, rd_len, + sp_limit, get_sp (), &initrd_start, &initrd_end); + +#if defined(CONFIG_OF_LIBFDT) + /* fixup the initrd now that we know where it should be */ + if ((of_flat_tree) && (initrd_start && initrd_end)) { + uint64_t addr, size; + int total = fdt_num_mem_rsv(of_flat_tree); + int j, err; + + /* Look for the dummy entry and delete it */ + for (j = 0; j < total; j++) { + err = fdt_get_mem_rsv(of_flat_tree, j, &addr, &size); + if (addr == rd_data_start) { + fdt_del_mem_rsv(of_flat_tree, j); + break; + } + } + + err = fdt_add_mem_rsv(of_flat_tree, initrd_start, + initrd_end - initrd_start + 1); + if (err < 0) { + printf("fdt_chosen: %s\n", fdt_strerror(err)); + return err; + } + + do_fixup_by_path_u32(of_flat_tree, "/chosen", + "linux,initrd-start", initrd_start, 0); + do_fixup_by_path_u32(of_flat_tree, "/chosen", + "linux,initrd-end", initrd_end, 0); + } +#endif debug ("## Transferring control to Linux (at address %08lx) ...\n", (ulong)kernel); -- 1.5.3.8

1 0

[U-Boot-Users] [PATCH 2/3] [new uImage] ppc: Determine if we are booting an OF style
by Kumar Gala 15 Feb '08

15 Feb '08

If we are bootin OF style than we can skip setting up some things that are used for the old boot method. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- patch against u-boot-testing new-image branch lib_ppc/bootm.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index 1f1be69..5158ccc 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -71,8 +71,21 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, bd_t *kbd; void (*kernel)(bd_t *, ulong, ulong, ulong, ulong); + int has_of = 0; + #if defined(CONFIG_OF_LIBFDT) char *of_flat_tree; + + /* determine if we are booting w/of */ + if (argc > 3) + has_of = 1; + if (image_check_type (hdr, IH_TYPE_MULTI)) { + ulong fdt_data, fdt_len; + image_multi_getimg (hdr, 2, &fdt_data, &fdt_len); + + if (fdt_len) + has_of = 1; + } #endif /* @@ -90,12 +103,14 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, alloc_current = sp_limit = get_boot_sp_limit(sp); debug ("=> set upper limit to 0x%08lx\n", sp_limit); - /* allocate space and init command line */ - alloc_current = get_boot_cmdline (alloc_current, &cmd_start, &cmd_end); + if (!has_of) { + /* allocate space and init command line */ + alloc_current = get_boot_cmdline (alloc_current, &cmd_start, &cmd_end); - /* allocate space for kernel copy of board info */ - alloc_current = get_boot_kbd (alloc_current, &kbd); - set_clocks_in_mhz(kbd); + /* allocate space for kernel copy of board info */ + alloc_current = get_boot_kbd (alloc_current, &kbd); + set_clocks_in_mhz(kbd); + } /* find kernel */ kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))image_get_ep (hdr); -- 1.5.3.8

1 0

[U-Boot-Users] [PATCH 1/3] [new uImage] Don't pass kdb to ramdisk_high since we may not have one
by Kumar Gala 15 Feb '08

15 Feb '08

We don't actually need the kdb param as we are just using it to get bd->bi_memsize which we can get from gd->bd->bi_memsize. Also, if we boot via OF we might not actually fill out a kdb. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- Patch against new-image u-boot-testing branch common/image.c | 9 ++++----- include/image.h | 2 +- lib_m68k/bootm.c | 3 +-- lib_ppc/bootm.c | 3 +-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/common/image.c b/common/image.c index 39e5f23..46cecef 100644 --- a/common/image.c +++ b/common/image.c @@ -495,7 +495,6 @@ void get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], * ramdisk_high - relocate init ramdisk * @rd_data: ramdisk data start address * @rd_len: ramdisk data length - * @kbd: kernel board info copy (within BOOTMAPSZ boundary) * @sp_limit: stack pointer limit (including BOOTMAPSZ) * @sp: current stack pointer * @initrd_start: pointer to a ulong variable, will hold final init ramdisk @@ -513,7 +512,7 @@ void get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], * - returns new allc_current, next free address below BOOTMAPSZ */ ulong ramdisk_high (ulong alloc_current, ulong rd_data, ulong rd_len, - bd_t *kbd, ulong sp_limit, ulong sp, + ulong sp_limit, ulong sp, ulong *initrd_start, ulong *initrd_end) { char *s; @@ -535,9 +534,9 @@ ulong ramdisk_high (ulong alloc_current, ulong rd_data, ulong rd_len, #ifdef CONFIG_LOGBUFFER /* Prevent initrd from overwriting logbuffer */ - if (initrd_high < (kbd->bi_memsize - LOGBUFF_LEN - LOGBUFF_OVERHEAD)) - initrd_high = kbd->bi_memsize - LOGBUFF_LEN - LOGBUFF_OVERHEAD; - debug ("## Logbuffer at 0x%08lx ", kbd->bi_memsize - LOGBUFF_LEN); + if (initrd_high < (gd->bd->bi_memsize - LOGBUFF_LEN - LOGBUFF_OVERHEAD)) + initrd_high = gd->bd->bi_memsize - LOGBUFF_LEN - LOGBUFF_OVERHEAD; + debug ("## Logbuffer at 0x%08lx ", gd->bd->bi_memsize - LOGBUFF_LEN); #endif debug ("## initrd_high = 0x%08lx, copy_to_ram = %d\n", initrd_high, initrd_copy_to_ram); diff --git a/include/image.h b/include/image.h index dbbbee9..a67489e 100644 --- a/include/image.h +++ b/include/image.h @@ -344,7 +344,7 @@ void get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], #if defined(CONFIG_PPC) || defined(CONFIG_M68K) ulong ramdisk_high (ulong alloc_current, ulong rd_data, ulong rd_len, - bd_t *kbd, ulong sp_limit, ulong sp, + ulong sp_limit, ulong sp, ulong *initrd_start, ulong *initrd_end); ulong get_boot_sp_limit (ulong sp); diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c index ac04da0..da76844 100644 --- a/lib_m68k/bootm.c +++ b/lib_m68k/bootm.c @@ -88,8 +88,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, rd_len = rd_data_end - rd_data_start; alloc_current = ramdisk_high (alloc_current, rd_data_start, rd_len, - kbd, sp_limit, get_sp (), - &initrd_start, &initrd_end); + sp_limit, get_sp (), &initrd_start, &initrd_end); debug("## Transferring control to Linux (at address %08lx) ...\n", (ulong) kernel); diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index 69ec459..1f1be69 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -107,8 +107,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, rd_len = rd_data_end - rd_data_start; alloc_current = ramdisk_high (alloc_current, rd_data_start, rd_len, - kbd, sp_limit, get_sp (), - &initrd_start, &initrd_end); + sp_limit, get_sp (), &initrd_start, &initrd_end); #if defined(CONFIG_OF_LIBFDT) /* find flattened device tree */ -- 1.5.3.8

1 0

[U-Boot-Users] New growth and girth guaranteed.
by Dimas Quale 15 Feb '08

15 Feb '08

When SMALL is a dirty word... --- avast! Antivirus: Outbound message clean. Virus Database (VPS): 080214-0, 02/14/2008 Tested on: 2/15/2008 1:41:13 PM avast! - copyright (c) 1988-2008 ALWIL Software. http://www.avast.com

1 0

[U-Boot-Users] [PATCH] Extend ATI Radeon driver to support more video modes
by Anatolij Gustschin 15 Feb '08

15 Feb '08

Adds ATI Radeon 9200 support for 1280x1024, 1024x768, 800x600, 640x480 at 24, 16 and 8 bpp. Hope this patch won't screw up X300 and X700 support. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- drivers/video/ati_radeon_fb.c | 401 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 386 insertions(+), 15 deletions(-) diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c index 0bdaa1c..740a360 100644 --- a/drivers/video/ati_radeon_fb.c +++ b/drivers/video/ati_radeon_fb.c @@ -44,6 +44,7 @@ #include <asm/io.h> #include <malloc.h> #include <video_fb.h> +#include "videomodes.h" #include <radeon.h> #include "ati_ids.h" @@ -70,6 +71,7 @@ #define PCI_CHIP_RV280_5961 0x5961 #define PCI_CHIP_RV280_5962 0x5962 #define PCI_CHIP_RV280_5964 0x5964 +#define PCI_CHIP_RV280_5C63 0x5C63 #define PCI_CHIP_RV370_5B60 0x5B60 #define PCI_CHIP_RV380_5657 0x5657 #define PCI_CHIP_R420_554d 0x554d @@ -79,6 +81,7 @@ static struct pci_device_id ati_radeon_pci_ids[] = { {PCI_VENDOR_ID_ATI, PCI_CHIP_RV280_5961}, {PCI_VENDOR_ID_ATI, PCI_CHIP_RV280_5962}, {PCI_VENDOR_ID_ATI, PCI_CHIP_RV280_5964}, + {PCI_VENDOR_ID_ATI, PCI_CHIP_RV280_5C63}, {PCI_VENDOR_ID_ATI, PCI_CHIP_RV370_5B60}, {PCI_VENDOR_ID_ATI, PCI_CHIP_RV380_5657}, {PCI_VENDOR_ID_ATI, PCI_CHIP_R420_554d}, @@ -90,12 +93,115 @@ static u16 ati_radeon_id_family_table[][2] = { {PCI_CHIP_RV280_5961, CHIP_FAMILY_RV280}, {PCI_CHIP_RV280_5962, CHIP_FAMILY_RV280}, {PCI_CHIP_RV280_5964, CHIP_FAMILY_RV280}, + {PCI_CHIP_RV280_5C63, CHIP_FAMILY_RV280}, {PCI_CHIP_RV370_5B60, CHIP_FAMILY_RV380}, {PCI_CHIP_RV380_5657, CHIP_FAMILY_RV380}, {PCI_CHIP_R420_554d, CHIP_FAMILY_R420}, {0, 0} }; +static struct { + unsigned char idx; + unsigned int val; +} pal_16[] = { + {0x00, 0x00000000}, + {0x00, 0x00000400}, + {0x04, 0x00000400}, + {0x08, 0x00080c08}, + {0x08, 0x00080808}, + {0x10, 0x00101410}, + {0x0c, 0x00080c08}, + {0x18, 0x00181c18}, + {0x10, 0x00101010}, + {0x20, 0x00202420}, + {0x14, 0x00101410}, + {0x28, 0x00292c29}, + {0x18, 0x00181818}, + {0x30, 0x00313431}, + {0x1c, 0x00181c18}, + {0x38, 0x00393c39}, + {0x20, 0x00202020}, + {0x40, 0x00414441}, + {0x24, 0x00202420}, + {0x48, 0x004a4c4a}, + {0x28, 0x00292829}, + {0x50, 0x00525552}, + {0x2c, 0x00292c29}, + {0x58, 0x005a5d5a}, + {0x30, 0x00313031}, + {0x60, 0x00626562}, + {0x34, 0x00313431}, + {0x68, 0x006a6d6a}, + {0x38, 0x00393839}, + {0x70, 0x00737573}, + {0x3c, 0x00393c39}, + {0x78, 0x007b7d7b}, + {0x40, 0x00414041}, + {0x80, 0x00838583}, + {0x44, 0x00414441}, + {0x88, 0x008b8d8b}, + {0x48, 0x004a484a}, + {0x90, 0x00949594}, + {0x4c, 0x004a4c4a}, + {0x98, 0x009c9d9c}, + {0x50, 0x00525052}, + {0xa0, 0x00a4a5a4}, + {0x54, 0x00525552}, + {0xa8, 0x00acaeac}, + {0x58, 0x005a595a}, + {0xb0, 0x00b4b6b4}, + {0x5c, 0x005a5d5a}, + {0xb8, 0x00bdbebd}, + {0x60, 0x00626162}, + {0xc0, 0x00c5c6c5}, + {0x64, 0x00626562}, + {0xc8, 0x00cdcecd}, + {0x68, 0x006a696a}, + {0xd0, 0x00d5d6d5}, + {0x6c, 0x006a6d6a}, + {0xd8, 0x00dedede}, + {0x70, 0x00737173}, + {0xe0, 0x00e6e6e6}, + {0x74, 0x00737573}, + {0xe8, 0x00eeeeee}, + {0x78, 0x007b797b}, + {0xf0, 0x00f6f6f6}, + {0x7c, 0x007b7d7b}, + {0xf8, 0x00ffffff}, + {0x80, 0x00838183}, + {0x84, 0x00838583}, + {0x88, 0x008b898b}, + {0x8c, 0x008b8d8b}, + {0x90, 0x00949194}, + {0x94, 0x00949594}, + {0x98, 0x009c999c}, + {0x9c, 0x009c9d9c}, + {0xa0, 0x00a4a1a4}, + {0xa4, 0x00a4a5a4}, + {0xa8, 0x00acaaac}, + {0xac, 0x00acaeac}, + {0xb0, 0x00b4b2b4}, + {0xb4, 0x00b4b6b4}, + {0xb8, 0x00bdbabd}, + {0xbc, 0x00bdbebd}, + {0xc0, 0x00c5c2c5}, + {0xc4, 0x00c5c6c5}, + {0xc8, 0x00cdcacd}, + {0xcc, 0x00cdcecd}, + {0xd0, 0x00d5d2d5}, + {0xd4, 0x00d5d6d5}, + {0xd8, 0x00dedade}, + {0xdc, 0x00dedede}, + {0xe0, 0x00e6e2e6}, + {0xe4, 0x00e6e6e6}, + {0xe8, 0x00eeeaee}, + {0xec, 0x00eeeeee}, + {0xf0, 0x00f6f2f6}, + {0xf4, 0x00f6f6f6}, + {0xf8, 0x00fffaff}, + {0xfc, 0x00ffffff}, +}; + u16 get_radeon_id_family(u16 device) { int i; @@ -350,6 +456,196 @@ void radeon_setmode(void) radeon_write_pll_regs(rinfo, mode); } +static void set_pal_16(void) +{ + int i; + + for (i = 0; i < 96; i++) { + OUTREG8(PALETTE_INDEX, pal_16[i].idx); + OUTREG(PALETTE_DATA, pal_16[i].val); + } +} + +static void set_pal_24(void) +{ + int idx, val = 0; + + for (idx = 0; idx < 256; idx++) { + OUTREG8(PALETTE_INDEX, idx); + OUTREG(PALETTE_DATA, val); + val += 0x00010101; + } +} + +void radeon_setmode_9200(int vesa_idx, int bpp) +{ + struct radeon_regs *mode = malloc(sizeof(struct radeon_regs)); + unsigned long dp_gm_cntl; + + mode->crtc_gen_cntl = 0x03000600; + mode->surface_cntl = 0x00a00000; + dp_gm_cntl = 0x100036d2; + mode->crtc_ext_cntl = 0x00008048; + mode->dac_cntl = 0xff002102; + mode->crtc_offset_cntl = 0x00008000; + + if (bpp == 16) { + mode->crtc_gen_cntl = 0x03000400; + dp_gm_cntl = 0x100034d2; + mode->surface_cntl = 0x00500000; + } else if (bpp == 8) { + mode->crtc_gen_cntl = 0x03000200; + dp_gm_cntl = 0x100032d2; + mode->surface_cntl = 0x00000000; + } + + if (vesa_idx == RES_MODE_640x480 && bpp == 8) { + mode->dac_cntl = 0xff002100; + mode->crtc_offset_cntl = 0x00000000; + } + + switch (vesa_idx) { + case RES_MODE_1280x1024: +#if 1 /* @ 60 Hz */ + mode->crtc_h_total_disp = 0x009f00d2; + mode->crtc_h_sync_strt_wid = 0x000e0528; + mode->crtc_v_total_disp = 0x03ff0429; + mode->crtc_v_sync_strt_wid = 0x00030400; + mode->crtc_pitch = 0x00a000a0; + mode->ppll_div_3 = 0x00010060; +#else /* @ 75 Hz */ + mode->crtc_h_total_disp = 0x009f00d2; + mode->crtc_h_sync_strt_wid = 0x00120508; + mode->crtc_v_total_disp = 0x03ff0429; + mode->crtc_v_sync_strt_wid = 0x00030400; + mode->crtc_pitch = 0x00a000a0; + mode->ppll_div_3 = 0x00010078; +#endif + switch (bpp) { + case 24: + mode->surf_info[0] = 0x00a10140; + mode->surf_upper_bound[0] = 0x004fffff; + break; + case 16: + mode->surf_info[0] = 0x005100a0; + mode->surf_upper_bound[0] = 0x0027ffff; + break; + default: /* 8 bpp */ + mode->surf_info[0] = 0x00010050; + mode->surf_upper_bound[0] = 0x0013ffff; + break; + } + break; + case RES_MODE_1024x768: +#if 1 /* @ 60 Hz */ + mode->crtc_h_total_disp = 0x007f00a7; + mode->crtc_h_sync_strt_wid = 0x00910410; + mode->crtc_v_total_disp = 0x02ff0325; + mode->crtc_v_sync_strt_wid = 0x00860302; + mode->crtc_pitch = 0x00800080; + mode->ppll_div_3 = 0x00020074; +#else /* @ 75 Hz */ + mode->crtc_h_total_disp = 0x007f00a3; + mode->crtc_h_sync_strt_wid = 0x000c0408; + mode->crtc_v_total_disp = 0x02ff031f; + mode->crtc_v_sync_strt_wid = 0x00030300; + mode->crtc_pitch = 0x00800080; + mode->ppll_div_3 = 0x0002008c; +#endif + switch (bpp) { + case 24: + mode->surf_info[0] = 0x00a10100; + mode->surf_upper_bound[0] = 0x002fffff; + break; + case 16: + mode->surf_info[0] = 0x00510080; + mode->surf_upper_bound[0] = 0x0017ffff; + break; + default: /* 8 bpp */ + mode->surf_info[0] = 0x00010040; + mode->surf_upper_bound[0] = 0x000bffff; + break; + } + break; + case RES_MODE_800x600: + mode->crtc_h_total_disp = 0x00630083; + mode->crtc_h_sync_strt_wid = 0x00100340; + mode->crtc_v_total_disp = 0x02570273; + mode->crtc_v_sync_strt_wid = 0x00040258; + mode->ppll_div_3 = 0x0003008e; + switch (bpp) { + case 24: + mode->crtc_pitch = 0x00680068; + mode->surf_info[0] = 0x00a100d0; + mode->surf_upper_bound[0] = 0x001edfff; + break; + case 16: + mode->crtc_pitch = 0x00700070; + mode->surf_info[0] = 0x00510070; + mode->surf_upper_bound[0] = 0x00109fff; + break; + default: /* 8 bpp */ + mode->crtc_pitch = 0x00800080; + mode->surf_info[0] = 0x00010040; + mode->surf_upper_bound[0] = 0x00097fff; + break; + } + break; + default: /* RES_MODE_640x480 */ + mode->crtc_h_total_disp = 0x4f0063; + mode->crtc_h_sync_strt_wid = 0x8c02a2; + mode->crtc_v_total_disp = 0x01df020c; + mode->crtc_v_sync_strt_wid = 0x8201ea; + mode->crtc_pitch = 0x00500050; + mode->ppll_div_3 = 0x00030059; + switch (bpp) { + case 24: + mode->surf_info[0] = 0x00a100a0; + mode->surf_upper_bound[0] = 0x0012bfff; + break; + case 16: + mode->surf_info[0] = 0x00510050; + mode->surf_upper_bound[0] = 0x00095fff; + break; + default: /* 8 bpp */ + break; + } + break; + } + + OUTREG(CRTC_GEN_CNTL, mode->crtc_gen_cntl); + OUTREGP(CRTC_EXT_CNTL, mode->crtc_ext_cntl, + ~(CRTC_HSYNC_DIS | CRTC_VSYNC_DIS | CRTC_DISPLAY_DIS)); + OUTREGP(DAC_CNTL, mode->dac_cntl, DAC_RANGE_CNTL | DAC_BLANKING); + OUTREG(CRTC_H_TOTAL_DISP, mode->crtc_h_total_disp); + OUTREG(CRTC_H_SYNC_STRT_WID, mode->crtc_h_sync_strt_wid); + OUTREG(CRTC_V_TOTAL_DISP, mode->crtc_v_total_disp); + OUTREG(CRTC_V_SYNC_STRT_WID, mode->crtc_v_sync_strt_wid); + OUTREG(CRTC_OFFSET, 0); + OUTREG(CRTC_OFFSET_CNTL, mode->crtc_offset_cntl); + OUTREG(CRTC_PITCH, mode->crtc_pitch); + + mode->clk_cntl_index = 0x300; + mode->ppll_ref_div = 0xc; + + radeon_write_pll_regs(rinfo, mode); + + OUTREG(SURFACE0_INFO, mode->surf_info[0]); + OUTREG(SURFACE0_LOWER_BOUND, 0); + OUTREG(SURFACE0_UPPER_BOUND, mode->surf_upper_bound[0]); + OUTREG(SURFACE_CNTL, mode->surface_cntl); + + OUTREG(DP_GUI_MASTER_CNTL, dp_gm_cntl); + OUTREG(0x0000325c, 0x0000000f); + + if (bpp == 24) + set_pal_24(); + else if (bpp == 16) + set_pal_16(); + + free(mode); +} + #include "../bios_emulator/include/biosemu.h" extern int BootVideoCardBIOS(pci_dev_t pcidev, BE_VGAInfo ** pVGAInfo, int cleanUp); @@ -421,29 +717,101 @@ GraphicDevice ctfb; void *video_hw_init(void) { GraphicDevice *pGD = (GraphicDevice *) & ctfb; - int i; u32 *vm; + char *penv; + unsigned long t1, hsynch, vsynch; + int bits_per_pixel, i, tmp, vesa_idx = 0, videomode; + struct ctfb_res_modes *res_mode; + struct ctfb_res_modes var_mode; rinfo = malloc(sizeof(struct radeonfb_info)); + printf("Video: "); if(radeon_probe(rinfo)) { printf("No radeon video card found!\n"); return NULL; } - /* fill in Graphic device struct */ - sprintf (pGD->modeIdent, "%dx%dx%d %ldkHz %ldHz", 640, - 480, 16, (1000 / 1000), - (2000 / 1000)); - printf ("%s\n", pGD->modeIdent); + tmp = 0; + + videomode = CFG_DEFAULT_VIDEO_MODE; + /* get video mode via environment */ + if ((penv = getenv ("videomode")) != NULL) { + /* deceide if it is a string */ + if (penv[0] <= '9') { + videomode = (int) simple_strtoul (penv, NULL, 16); + tmp = 1; + } + } else { + tmp = 1; + } + if (tmp) { + /* parameter are vesa modes */ + /* search params */ + for (i = 0; i < VESA_MODES_COUNT; i++) { + if (vesa_modes[i].vesanr == videomode) + break; + } + if (i == VESA_MODES_COUNT) { + printf ("no VESA Mode found, switching to mode 0x%x ", CFG_DEFAULT_VIDEO_MODE); + i = 0; + } + res_mode = (struct ctfb_res_modes *) &res_mode_init[vesa_modes[i].resindex]; + bits_per_pixel = vesa_modes[i].bits_per_pixel; + vesa_idx = vesa_modes[i].resindex; + } else { + res_mode = (struct ctfb_res_modes *) &var_mode; + bits_per_pixel = video_get_params (res_mode, penv); + } - pGD->winSizeX = 640; - pGD->winSizeY = 480; - pGD->plnSizeX = 640; - pGD->plnSizeY = 480; + /* calculate hsynch and vsynch freq (info only) */ + t1 = (res_mode->left_margin + res_mode->xres + + res_mode->right_margin + res_mode->hsync_len) / 8; + t1 *= 8; + t1 *= res_mode->pixclock; + t1 /= 1000; + hsynch = 1000000000L / t1; + t1 *= (res_mode->upper_margin + res_mode->yres + + res_mode->lower_margin + res_mode->vsync_len); + t1 /= 1000; + vsynch = 1000000000L / t1; - pGD->gdfBytesPP = 1; - pGD->gdfIndex = GDF__8BIT_INDEX; + /* fill in Graphic device struct */ + sprintf (pGD->modeIdent, "%dx%dx%d %ldkHz %ldHz", res_mode->xres, + res_mode->yres, bits_per_pixel, (hsynch / 1000), + (vsynch / 1000)); + printf ("%s\n", pGD->modeIdent); + pGD->winSizeX = res_mode->xres; + pGD->winSizeY = res_mode->yres; + pGD->plnSizeX = res_mode->xres; + pGD->plnSizeY = res_mode->yres; + + switch (bits_per_pixel) { + case 24: + pGD->gdfBytesPP = 4; + pGD->gdfIndex = GDF_32BIT_X888RGB; + if (res_mode->xres == 800) { + pGD->winSizeX = 832; + pGD->plnSizeX = 832; + } + break; + case 16: + pGD->gdfBytesPP = 2; + pGD->gdfIndex = GDF_16BIT_565RGB; + if (res_mode->xres == 800) { + pGD->winSizeX = 896; + pGD->plnSizeX = 896; + } + break; + default: + if (res_mode->xres == 800) { + pGD->winSizeX = 1024; + pGD->plnSizeX = 1024; + } + pGD->gdfBytesPP = 1; + pGD->gdfIndex = GDF__8BIT_INDEX; + break; + } pGD->isaBase = CFG_ISA_IO_BASE_ADDRESS; pGD->pciBase = rinfo->fb_base_phys; @@ -464,14 +832,17 @@ void *video_hw_init(void) pGD->cprBase = rinfo->fb_base_phys; /* Dummy */ /* set up Hardware */ - /* Clear video memory */ - i = pGD->memSize / 4; + /* Clear video memory (only visible screen area) */ + i = pGD->winSizeX * pGD->winSizeY * pGD->gdfBytesPP / 4; vm = (unsigned int *) pGD->pciBase; while (i--) *vm++ = 0; /*SetDrawingEngine (bits_per_pixel);*/ - radeon_setmode(); + if (rinfo->family == CHIP_FAMILY_RV280) + radeon_setmode_9200(vesa_idx, bits_per_pixel); + else + radeon_setmode(); return ((void *) pGD); } -- 1.5.3.3

4 6

[U-Boot-Users] [PATCH] TQM834x: clean up configuration
by Wolfgang Denk 15 Feb '08

15 Feb '08

Get board name consistent with Linux and elsewhere; get rid of local network definitions etc. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- include/configs/TQM834x.h | 27 +++++---------------------- 1 files changed, 5 insertions(+), 22 deletions(-) diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 7373d7b..024ecfa 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -492,24 +492,7 @@ extern int tqm834x_num_flash_banks; * Environment Configuration */ -#if defined(CONFIG_TSEC_ENET) -#define CONFIG_HAS_ETH0 -#define CONFIG_ETHADDR D2:DA:5E:44:BC:29 -#define CONFIG_HAS_ETH1 -#define CONFIG_ETH1ADDR 1E:F3:40:21:92:53 -#endif - -#define CONFIG_IPADDR 192.168.205.1 - -#define CONFIG_HOSTNAME tqm8349 -#define CONFIG_ROOTPATH /opt/eldk/ppc_6xx -#define CONFIG_BOOTFILE /tftpboot/tqm83xx/uImage - -#define CONFIG_SERVERIP 192.168.1.1 -#define CONFIG_GATEWAYIP 192.168.1.1 -#define CONFIG_NETMASK 255.255.255.0 - -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 400000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ @@ -524,7 +507,7 @@ extern int tqm834x_num_flash_banks; #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ - "hostname=tqm83xx\0" \ + "hostname=tqm834x\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath}\0" \ "ramargs=setenv bootargs root=/dev/ram rw\0" \ @@ -536,13 +519,13 @@ extern int tqm834x_num_flash_banks; "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;" \ + "net_nfs=tftp 400000 ${bootfile};run nfsargs addip addtty;" \ "bootm\0" \ "rootpath=/opt/eldk/ppc_6xx\0" \ - "bootfile=/tftpboot/tqm83xx/uImage\0" \ + "bootfile=/tftpboot/tqm834x/uImage\0" \ "kernel_addr=80060000\0" \ "ramdisk_addr=80160000\0" \ - "load=tftp 100000 /tftpboot/tqm83xx/u-boot.bin\0" \ + "load=tftp 100000 /tftpboot/tqm834x/u-boot.bin\0" \ "update=protect off 80000000 8003ffff; " \ "era 80000000 8003ffff; cp.b 100000 80000000 40000\0" \ "upd=run load;run update\0" \ -- 1.5.3.3

2 1