April 2012 - U-Boot

[U-Boot] Porting u-boot for MPC8280 based board.
by Thirumalesha N 26 Apr '12

26 Apr '12

Hi, I am trying to port u-boot for MPC8280 by taking reference MPC8260ADS, but its not booting, u-boot Version u-boot-1.3.1 ARCH = PPC 82xx Processor = MPC8280 Bootflash = AM29LV040B (512kb) mirror bit sdram = 512MB I modified MPC8260ADS with CPU clock frequency 100MHz, Text base 0xfff00000, Flash Base 0xfff00000 and sdram base 0x00000000, and console on SMC of port pins PA9(RX) and PA8 (Tx), But nothing am getting on serial port while booting. Please can any one suggest me to come out of this. Thanks for your suggestion in Advance Regarding Thirumalesha N Namagondlu

2 5

[U-Boot] [PATCH] powerpc/p1010rdb: update mux config of p1010rdb board
by Shengzhou Liu 26 Apr '12

26 Apr '12

On p1010rdb some signals are muxed for tdm/can/uart/flash. If we don't set fsl_p1010mux:tdm_can to "can" or "tdm" explicitly, defaultly we keep spi chip selection to spi-flash instead of to tdm/slic and disable uart1 when not using flexcan, as well disable sdhc. Signed-off-by: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> --- based on 'next' branch of git://git.denx.de/u-boot.git tree board/freescale/p1010rdb/p1010rdb.c | 56 +++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 12 deletions(-) diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index b9e66f7..fbf975d 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -256,6 +256,31 @@ void fdt_del_tdm(void *blob) } } +void fdt_del_sdhc(void *blob) +{ + int nodeoff = 0; + + while ((nodeoff = fdt_node_offset_by_compatible(blob, 0, + "fsl,esdhc")) >= 0) { + fdt_del_node(blob, nodeoff); + } +} + +void fdt_disable_uart1(void *blob) +{ + int nodeoff; + + nodeoff = fdt_node_offset_by_compat_reg(blob, "fsl,ns16550", + CONFIG_SYS_NS16550_COM2); + + if (nodeoff > 0) { + fdt_status_disabled(blob, nodeoff); + } else { + printf("WARNING unable to set status for fsl,ns16550 " + "uart1: %s\n", fdt_strerror(nodeoff)); + } +} + void ft_board_setup(void *blob, bd_t *bd) { phys_addr_t base; @@ -285,19 +310,26 @@ void ft_board_setup(void *blob, bd_t *bd) fdt_del_node_and_alias(blob, "ethernet2"); } #ifndef CONFIG_SDCARD + /* disable sdhc due to sdhc bug */ + fdt_del_sdhc(blob); if (hwconfig_subarg_cmp("fsl_p1010mux", "tdm_can", "can")) { - printf("fdt CAN"); fdt_del_tdm(blob); fdt_del_spi_slic(blob); - } -#ifndef CONFIG_SPIFLASH - else if (hwconfig_subarg_cmp("fsl_p1010mux", "tdm_can", "tdm")) { - printf("fdt TDM"); + } else if (hwconfig_subarg_cmp("fsl_p1010mux", "tdm_can", "tdm")) { fdt_del_flexcan(blob); fdt_del_spi_flash(blob); + fdt_disable_uart1(blob); + } else { + /* + * If we don't set fsl_p1010mux:tdm_can to "can" or "tdm" + * explicitly, defaultly spi_cs_sel to spi-flash instead of + * to tdm/slic. + */ + fdt_del_tdm(blob); + fdt_del_flexcan(blob); + fdt_disable_uart1(blob); } #endif -#endif } #endif @@ -313,10 +345,7 @@ int misc_init_r(void) MPC85xx_PMUXCR_CAN2_TDM | MPC85xx_PMUXCR_CAN2_UART); out_8(&cpld_data->tdm_can_sel, MUX_CPLD_CAN_UART); - } -#ifndef CONFIG_SPIFLASH - if (hwconfig_subarg_cmp("fsl_p1010mux", "tdm_can", "tdm")) { - printf("TDM"); + } else if (hwconfig_subarg_cmp("fsl_p1010mux", "tdm_can", "tdm")) { clrbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_CAN2_UART | MPC85xx_PMUXCR_CAN1_UART); setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_CAN2_TDM | @@ -325,8 +354,11 @@ int misc_init_r(void) setbits_be32(&gur->pmuxcr2, MPC85xx_PMUXCR2_UART_TDM); out_8(&cpld_data->tdm_can_sel, MUX_CPLD_TDM); out_8(&cpld_data->spi_cs0_sel, MUX_CPLD_SPICS0_SLIC); - } -#endif + } else { + /* defaultly spi_cs_sel to flash */ + out_8(&cpld_data->spi_cs0_sel, MUX_CPLD_SPICS0_FLASH); + } + return 0; } #endif -- 1.7.0.4

1 0

Re: [U-Boot] Can anyone help me to solve the stack problem of U-boot? Urgent~
by Wolfgang Denk 26 Apr '12

26 Apr '12

Dear =?big5?B?p2Sn065w?=, In message <001e01cd2301$609c2e00$21d48a00$@xyz@msa.hinet.net> you wrote: ... Urgent~ ... > Please help me because this problem had confused me a lot of days. Please see the README (section "U-Boot Porting Guide", but also section "System Initialization"), and read doc/README.SPL and http://catb.org/esr/faqs/smart-questions.html If this is urgent, and you spent many days on this, then the best advice for you is to hire an expert. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de "Unix is simple, but it takes a genius to understand the simplicity." - Dennis Ritchie

3 2

[U-Boot] [PATCH v2 1/3] LCD: display 32bpp decompressed bitmap image
by Donghwa Lee 26 Apr '12

26 Apr '12

This patch supports drawing 32bpp decompressed bitmap image. change of v1: - use lcd_line_length variable - convert RGB to BGR because BMP data format aligned BGR. Signed-off-by: Donghwa Lee <dh09.lee(a)samsung.com> Signed-off-by: Kyungmin.park <kyungmin.park(a)samsung.com> --- common/lcd.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index bf1a6a9..460442d 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -616,6 +616,9 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) #if !defined(CONFIG_MCC200) ushort *cmap = NULL; #endif +#if defined(CONFIG_BMP_32BPP) + uchar r, g, b, a; +#endif ushort *cmap_base = NULL; ushort i, j; uchar *fb; @@ -645,14 +648,14 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) bpix = NBITS(panel_info.vl_bpix); - if ((bpix != 1) && (bpix != 8) && (bpix != 16)) { + if ((bpix != 1) && (bpix != 8) && (bpix != 16) && (bpix != 32)) { printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n", bpix, bmp_bpix); return 1; } /* We support displaying 8bpp BMPs on 16bpp LCDs */ - if (bpix != bmp_bpix && (bmp_bpix != 8 || bpix != 16)) { + if (bpix != bmp_bpix && (bmp_bpix != 8 || bpix != 16 || bpix != 32)) { printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n", bpix, le16_to_cpu(bmp->header.bit_count)); @@ -669,7 +672,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) cmap = (ushort *)fbi->palette; #elif defined(CONFIG_MPC823) cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]); -#elif !defined(CONFIG_ATMEL_LCD) +#elif !defined(CONFIG_ATMEL_LCD) && !defined(CONFIG_EXYNOS_FB) cmap = panel_info.cmap; #endif @@ -791,6 +794,24 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) break; #endif /* CONFIG_BMP_16BPP */ +#if defined(CONFIG_BMP_32BPP) + case 32: + for (i = 0; i < height; ++i) { + for (j = 0; j < width; j++) { + b = *(bmap++); + g = *(bmap++); + r = *(bmap++); + a = *(bmap++); + + *(fb++) = r; + *(fb++) = g; + *(fb++) = b; + *(fb++) = a; + } + fb -= (lcd_line_length + width * (bpix / 8)); + } + break; +#endif /* CONFIG_BMP_32BPP */ default: break; }; -- 1.7.4.1

1 0

[U-Boot] [PATCH 2/4][v2] powerpc/85xx:Fix MSR[DE] bit in MSR to support debugger
by Prabhakar Kushwaha 26 Apr '12

26 Apr '12

Debugging of e500 and e500v1 processer requires MSR[DE] bit to be set always. Where MSR = Machine State register Make sure of MSR[DE] bit is set uniformaly across the different execution address space i.e. AS0 and AS1. Signed-off-by: Radu Lazarescu <radu.lazarescu(a)freescale.com> Signed-off-by: Catalin Udma <catalin.udma(a)freescale.com> Signed-off-by: Marius Grigoras <marius.grigoras(a)freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- Based upon git://git.denx.de/u-boot.git branch master Changes for v2: - Avoid MSR_DE negation in arch_preboot - Made MSR_DE set code independent of any #define No change, Resending again Tested on - SoC having E500 Family processor (P1010RDB, BSC9131RDB) - SoC having E500MC Family processor (P4080DS, P3041DS) arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 2e4a06c..3bcbffa 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -532,7 +532,7 @@ void arch_preboot_os(void) * disabled by the time we get called. */ msr = mfmsr(); - msr &= ~(MSR_ME|MSR_CE|MSR_DE); + msr &= ~(MSR_ME|MSR_CE); mtmsr(msr); setup_ivors(); diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 7bfa2d5..597151b 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -82,6 +82,9 @@ .globl _start_e500 _start_e500: +/* Enable debug exception */ + li r1,MSR_DE + mtmsr r1 #if defined(CONFIG_SECURE_BOOT) && defined(CONFIG_E500MC) /* ISBC uses L2 as stack. @@ -729,8 +732,8 @@ create_init_ram_area: msync tlbwe - lis r6,MSR_IS|MSR_DS@h - ori r6,r6,MSR_IS|MSR_DS@l + lis r6,MSR_IS|MSR_DS|MSR_DE@h + ori r6,r6,MSR_IS|MSR_DS|MSR_DE@l lis r7,switch_as@h ori r7,r7,switch_as@l -- 1.7.5.4

3 5

[U-Boot] [PATCH 3/4][v3] powerpc/85xx:Make debug exception vector accessible
by Prabhakar Kushwaha 26 Apr '12

26 Apr '12

Debugging of e500 and e500v1 processer requires debug exception vecter (IVPR + IVOR15) to have valid and fetchable OP code. While executing in translated space (AS=1), whenever a debug exception is generated, the MSR[DS/IS] gets cleared i.e. AS=0 and the processor tries to fetch an instruction from the debug exception vector (IVPR + IVOR15); since now we are in AS=0, the application needs to ensure the proper TLB configuration to have (IVOR + IVOR15) accessible from AS=0 also. Create a temporary TLB in AS0 to make sure debug exception verctor is accessible on debug exception. Signed-off-by: Radu Lazarescu <radu.lazarescu(a)freescale.com> Signed-off-by: Marius Grigoras <marius.grigoras(a)freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- Based upon git://git.denx.de/u-boot.git branch master Changes for v2: - Put Temporary TLB creation under #define Changes for v3: - Removed unnecessary CONFIG_E500 - Updated CONFG_SYS_RAMBOOT mas2 properties - Added secure boot Debug TLB. - Avoid temp TLB creation for NAND SPL - removed unnecessary mas7 updation Tested on - SoC having E500 Family processor (P1010RDB, BSC9131RDB) - SoC having E500MC Family processor (P4080DS, P3041DS) arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 32 +++++++++++++- arch/powerpc/cpu/mpc85xx/start.S | 66 +++++++++++++++++++++++++++++ arch/powerpc/include/asm/config_mpc85xx.h | 3 +- 3 files changed, 99 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c index 091af7c..dacfdd1 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c @@ -1,5 +1,5 @@ /* - * Copyright 2009-2011 Freescale Semiconductor, Inc + * Copyright 2009-2012 Freescale Semiconductor, Inc * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -53,6 +53,36 @@ void setup_ifc(void) asm volatile("isync;msync;tlbwe;isync"); +#if defined(CONFIG_SYS_PPC_E500_DEBUG_TLB) +/* + * TLB entry for debuggging in AS1 + * Create temporary TLB entry in AS0 to handle debug exception + * As on debug exception MSR is cleared i.e. Address space is changed + * to 0. A TLB entry (in AS0) is required to handle debug exception generated + * in AS1. + * + * TLB entry is created for IVPR + IVOR15 to map on valid OP code address + * bacause flash's physical address is going to change as + * CONFIG_SYS_FLASH_BASE_PHYS. + */ + _mas0 = MAS0_TLBSEL(1) | + MAS0_ESEL(CONFIG_SYS_PPC_E500_DEBUG_TLB); + _mas1 = MAS1_VALID | MAS1_TID(0) | MAS1_IPROT | + MAS1_TSIZE(BOOKE_PAGESZ_4M); + _mas2 = FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE, MAS2_I|MAS2_G); + _mas3 = FSL_BOOKE_MAS3(flash_phys, 0, MAS3_SW|MAS3_SR|MAS3_SX); + _mas7 = FSL_BOOKE_MAS7(flash_phys); + + mtspr(MAS0, _mas0); + mtspr(MAS1, _mas1); + mtspr(MAS2, _mas2); + mtspr(MAS3, _mas3); + mtspr(MAS7, _mas7); + + asm volatile("isync;msync;tlbwe;isync"); +#endif + + /* Change flash's physical address */ out_be32(&(ifc_regs->cspr_cs[0].cspr), CONFIG_SYS_CSPR0); out_be32(&(ifc_regs->csor_cs[0].csor), CONFIG_SYS_CSOR0); out_be32(&(ifc_regs->amask_cs[0].amask), CONFIG_SYS_AMASK0); diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 597151b..1cfd08a 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -182,6 +182,72 @@ l2_disabled: andi. r1,r3,L1CSR0_DCE@l beq 2b +#if defined(CONFIG_SYS_PPC_E500_DEBUG_TLB) +/* + * TLB entry for debuggging in AS1 + * Create temporary TLB entry in AS0 to handle debug exception + * As on debug exception MSR is cleared i.e. Address space is changed + * to 0. A TLB entry (in AS0) is required to handle debug exception generated + * in AS1. + */ + + lis r6,FSL_BOOKE_MAS0(1, + CONFIG_SYS_PPC_E500_DEBUG_TLB, 0)@h + ori r6,r6,FSL_BOOKE_MAS0(1, + CONFIG_SYS_PPC_E500_DEBUG_TLB, 0)@l + +#if !defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_SECURE_BOOT) +/* + * TLB entry is created for IVPR + IVOR15 to map on valid OP code address + * bacause flash's virtual address maps to 0xff800000 - 0xffffffff. + * and this window is outside of 4K boot window. + */ + lis r7,FSL_BOOKE_MAS1(1, 1, 0, 0, BOOKE_PAGESZ_4M)@h + ori r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 0, BOOKE_PAGESZ_4M)@l + + lis r8,FSL_BOOKE_MAS2(CONFIG_SYS_MONITOR_BASE & 0xffc00000, + (MAS2_I|MAS2_G))@h + ori r8,r8,FSL_BOOKE_MAS2(CONFIG_SYS_MONITOR_BASE & 0xffc00000, + (MAS2_I|MAS2_G))@l + + /* The 85xx has the default boot window 0xff800000 - 0xffffffff */ + lis r9,FSL_BOOKE_MAS3(0xffc00000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h + ori r9,r9,FSL_BOOKE_MAS3(0xffc00000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l +#elif !defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SECURE_BOOT) + lis r7,FSL_BOOKE_MAS1(1, 1, 0, 0, BOOKE_PAGESZ_1M)@h + ori r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 0, BOOKE_PAGESZ_1M)@l + + lis r8,FSL_BOOKE_MAS2(CONFIG_SYS_MONITOR_BASE,(MAS2_I|MAS2_G))@h + ori r8,r8,FSL_BOOKE_MAS2(CONFIG_SYS_MONITOR_BASE,(MAS2_I|MAS2_G))@l + + lis r9,FSL_BOOKE_MAS3(CONFIG_SYS_PBI_FLASH_WINDOW, 0, + (MAS3_SX|MAS3_SW|MAS3_SR))@h + ori r9,r9,FSL_BOOKE_MAS3(CONFIG_SYS_PBI_FLASH_WINDOW, 0, + (MAS3_SX|MAS3_SW|MAS3_SR))@l +#else +/* + * TLB entry is created for IVPR + IVOR15 to map on valid OP code address + * because "nexti" will resize TLB to 4K + */ + lis r7,FSL_BOOKE_MAS1(1, 1, 0, 0, BOOKE_PAGESZ_256K)@h + ori r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 0, BOOKE_PAGESZ_256K)@l + + lis r8,FSL_BOOKE_MAS2(CONFIG_SYS_MONITOR_BASE, (MAS2_I))@h + ori r8,r8,FSL_BOOKE_MAS2(CONFIG_SYS_MONITOR_BASE, + (MAS2_I))@l + lis r9,FSL_BOOKE_MAS3(CONFIG_SYS_MONITOR_BASE, 0, + (MAS3_SX|MAS3_SW|MAS3_SR))@h + ori r9,r9,FSL_BOOKE_MAS3(CONFIG_SYS_MONITOR_BASE, 0, + (MAS3_SX|MAS3_SW|MAS3_SR))@l +#endif + mtspr MAS0,r6 + mtspr MAS1,r7 + mtspr MAS2,r8 + mtspr MAS3,r9 + tlbwe + isync +#endif + /* * Ne need to setup interrupt vector for NAND SPL * because NAND SPL never compiles it. diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 8654625..268c56e 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. + * Copyright 2011-2012 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -107,6 +107,7 @@ #define CONFIG_MAX_CPUS 1 #define CONFIG_FSL_SDHC_V2_3 #define CONFIG_SYS_FSL_NUM_LAWS 12 +#define CONFIG_SYS_PPC_E500_DEBUG_TLB 3 #define CONFIG_TSECV2 #define CONFIG_SYS_FSL_SEC_COMPAT 4 #define CONFIG_FSL_SATA_V2 -- 1.7.5.4

3 7

[U-Boot] [PATCH] Add support s3c2440 NAND controller
by Ilya Averyanov 26 Apr '12

26 Apr '12

arch/arm/include/asm/arch-s3c24x0/s3c2410.h | 4 +- arch/arm/include/asm/arch-s3c24x0/s3c2440.h | 4 +- arch/arm/include/asm/arch-s3c24x0/s3c24x0.h | 13 +- drivers/mtd/nand/Makefile | 3 +- drivers/mtd/nand/s3c2410_nand.c | 189 ------------------- drivers/mtd/nand/s3c24x0_nand.c | 268 +++++++++++++++++++++++++++ 6 files changed, 283 insertions(+), 198 deletions(-) delete mode 100644 drivers/mtd/nand/s3c2410_nand.c create mode 100644 drivers/mtd/nand/s3c24x0_nand.c diff --git a/arch/arm/include/asm/arch-s3c24x0/s3c2410.h b/arch/arm/include/asm/arch-s3c24x0/s3c2410.h index 4fbdf20..71eb33e 100644 --- a/arch/arm/include/asm/arch-s3c24x0/s3c2410.h +++ b/arch/arm/include/asm/arch-s3c24x0/s3c2410.h @@ -99,9 +99,9 @@ static inline struct s3c24x0_lcd *s3c24x0_get_base_lcd(void) return (struct s3c24x0_lcd *)S3C24X0_LCD_BASE; } -static inline struct s3c2410_nand *s3c2410_get_base_nand(void) +static inline struct s3c24x0_nand *s3c24x0_get_base_nand(void) { - return (struct s3c2410_nand *)S3C2410_NAND_BASE; + return (struct s3c24x0_nand *)S3C2410_NAND_BASE; } static inline struct s3c24x0_uart diff --git a/arch/arm/include/asm/arch-s3c24x0/s3c2440.h b/arch/arm/include/asm/arch-s3c24x0/s3c2440.h index 8c606e3..8b9a5b0 100644 --- a/arch/arm/include/asm/arch-s3c24x0/s3c2440.h +++ b/arch/arm/include/asm/arch-s3c24x0/s3c2440.h @@ -97,9 +97,9 @@ static inline struct s3c24x0_lcd *s3c24x0_get_base_lcd(void) return (struct s3c24x0_lcd *)S3C24X0_LCD_BASE; } -static inline struct s3c2440_nand *s3c2440_get_base_nand(void) +static inline struct s3c24x0_nand *s3c24x0_get_base_nand(void) { - return (struct s3c2440_nand *)S3C2440_NAND_BASE; + return (struct s3c24x0_nand *)S3C2440_NAND_BASE; } static inline struct s3c24x0_uart diff --git a/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h index ca978c9..d82251d 100644 --- a/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h +++ b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h @@ -151,20 +151,19 @@ struct s3c24x0_lcd { }; + +struct s3c24x0_nand { #ifdef CONFIG_S3C2410 /* NAND FLASH (see S3C2410 manual chapter 6) */ -struct s3c2410_nand { u32 nfconf; u32 nfcmd; u32 nfaddr; u32 nfdata; u32 nfstat; u32 nfecc; -}; #endif #ifdef CONFIG_S3C2440 /* NAND FLASH (see S3C2440 manual chapter 6) */ -struct s3c2440_nand { u32 nfconf; u32 nfcont; u32 nfcmd; @@ -176,8 +175,14 @@ struct s3c2440_nand { u32 nfstat; u32 nfstat0; u32 nfstat1; -}; + u32 nfmecc0; + u32 nfmecc1; + u32 nfsecc; + u32 nfsblk; + u32 nfeblk; #endif +}; + /* UART (see manual chapter 11) */ diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 1d1b628..b080cf7 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -58,7 +58,8 @@ COBJS-$(CONFIG_NAND_MXC) += mxc_nand.o COBJS-$(CONFIG_NAND_MXS) += mxs_nand.o COBJS-$(CONFIG_NAND_NDFC) += ndfc.o COBJS-$(CONFIG_NAND_NOMADIK) += nomadik.o -COBJS-$(CONFIG_NAND_S3C2410) += s3c2410_nand.o +COBJS-$(CONFIG_NAND_S3C2410) += s3c24x0_nand.o +COBJS-$(CONFIG_NAND_S3C2440) += s3c24x0_nand.o COBJS-$(CONFIG_NAND_S3C64XX) += s3c64xx.o COBJS-$(CONFIG_NAND_SPEAR) += spr_nand.o COBJS-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o diff --git a/drivers/mtd/nand/s3c2410_nand.c b/drivers/mtd/nand/s3c2410_nand.c deleted file mode 100644 index e1a459b..0000000 --- a/drivers/mtd/nand/s3c2410_nand.c +++ /dev/null @@ -1,189 +0,0 @@ -/* - * (C) Copyright 2006 OpenMoko, Inc. - * Author: Harald Welte <laforge(a)openmoko.org> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include <common.h> - -#include <nand.h> -#include <asm/arch/s3c24x0_cpu.h> -#include <asm/io.h> - -#define S3C2410_NFCONF_EN (1<<15) -#define S3C2410_NFCONF_512BYTE (1<<14) -#define S3C2410_NFCONF_4STEP (1<<13) -#define S3C2410_NFCONF_INITECC (1<<12) -#define S3C2410_NFCONF_nFCE (1<<11) -#define S3C2410_NFCONF_TACLS(x) ((x)<<8) -#define S3C2410_NFCONF_TWRPH0(x) ((x)<<4) -#define S3C2410_NFCONF_TWRPH1(x) ((x)<<0) - -#define S3C2410_ADDR_NALE 4 -#define S3C2410_ADDR_NCLE 8 - -#ifdef CONFIG_NAND_SPL - -/* in the early stage of NAND flash booting, printf() is not available */ -#define printf(fmt, args...) - -static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) -{ - int i; - struct nand_chip *this = mtd->priv; - - for (i = 0; i < len; i++) - buf[i] = readb(this->IO_ADDR_R); -} -#endif - -static void s3c2410_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) -{ - struct nand_chip *chip = mtd->priv; - struct s3c2410_nand *nand = s3c2410_get_base_nand(); - - debug("hwcontrol(): 0x%02x 0x%02x\n", cmd, ctrl); - - if (ctrl & NAND_CTRL_CHANGE) { - ulong IO_ADDR_W = (ulong)nand; - - if (!(ctrl & NAND_CLE)) - IO_ADDR_W |= S3C2410_ADDR_NCLE; - if (!(ctrl & NAND_ALE)) - IO_ADDR_W |= S3C2410_ADDR_NALE; - - chip->IO_ADDR_W = (void *)IO_ADDR_W; - - if (ctrl & NAND_NCE) - writel(readl(&nand->nfconf) & ~S3C2410_NFCONF_nFCE, - &nand->nfconf); - else - writel(readl(&nand->nfconf) | S3C2410_NFCONF_nFCE, - &nand->nfconf); - } - - if (cmd != NAND_CMD_NONE) - writeb(cmd, chip->IO_ADDR_W); -} - -static int s3c2410_dev_ready(struct mtd_info *mtd) -{ - struct s3c2410_nand *nand = s3c2410_get_base_nand(); - debug("dev_ready\n"); - return readl(&nand->nfstat) & 0x01; -} - -#ifdef CONFIG_S3C2410_NAND_HWECC -void s3c2410_nand_enable_hwecc(struct mtd_info *mtd, int mode) -{ - struct s3c2410_nand *nand = s3c2410_get_base_nand(); - debug("s3c2410_nand_enable_hwecc(%p, %d)\n", mtd, mode); - writel(readl(&nand->nfconf) | S3C2410_NFCONF_INITECC, &nand->nfconf); -} - -static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, - u_char *ecc_code) -{ - struct s3c2410_nand *nand = s3c2410_get_base_nand(); - ecc_code[0] = readb(&nand->nfecc); - ecc_code[1] = readb(&nand->nfecc + 1); - ecc_code[2] = readb(&nand->nfecc + 2); - debug("s3c2410_nand_calculate_hwecc(%p,): 0x%02x 0x%02x 0x%02x\n", - mtd , ecc_code[0], ecc_code[1], ecc_code[2]); - - return 0; -} - -static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat, - u_char *read_ecc, u_char *calc_ecc) -{ - if (read_ecc[0] == calc_ecc[0] && - read_ecc[1] == calc_ecc[1] && - read_ecc[2] == calc_ecc[2]) - return 0; - - printf("s3c2410_nand_correct_data: not implemented\n"); - return -1; -} -#endif - -int board_nand_init(struct nand_chip *nand) -{ - u_int32_t cfg; - u_int8_t tacls, twrph0, twrph1; - struct s3c24x0_clock_power *clk_power = s3c24x0_get_base_clock_power(); - struct s3c2410_nand *nand_reg = s3c2410_get_base_nand(); - - debug("board_nand_init()\n"); - - writel(readl(&clk_power->clkcon) | (1 << 4), &clk_power->clkcon); - - /* initialize hardware */ -#if defined(CONFIG_S3C24XX_CUSTOM_NAND_TIMING) - tacls = CONFIG_S3C24XX_TACLS; - twrph0 = CONFIG_S3C24XX_TWRPH0; - twrph1 = CONFIG_S3C24XX_TWRPH1; -#else - tacls = 4; - twrph0 = 8; - twrph1 = 8; -#endif - - cfg = S3C2410_NFCONF_EN; - cfg |= S3C2410_NFCONF_TACLS(tacls - 1); - cfg |= S3C2410_NFCONF_TWRPH0(twrph0 - 1); - cfg |= S3C2410_NFCONF_TWRPH1(twrph1 - 1); - writel(cfg, &nand_reg->nfconf); - - /* initialize nand_chip data structure */ - nand->IO_ADDR_R = (void *)&nand_reg->nfdata; - nand->IO_ADDR_W = (void *)&nand_reg->nfdata; - - nand->select_chip = NULL; - - /* read_buf and write_buf are default */ - /* read_byte and write_byte are default */ -#ifdef CONFIG_NAND_SPL - nand->read_buf = nand_read_buf; -#endif - - /* hwcontrol always must be implemented */ - nand->cmd_ctrl = s3c2410_hwcontrol; - - nand->dev_ready = s3c2410_dev_ready; - -#ifdef CONFIG_S3C2410_NAND_HWECC - nand->ecc.hwctl = s3c2410_nand_enable_hwecc; - nand->ecc.calculate = s3c2410_nand_calculate_ecc; - nand->ecc.correct = s3c2410_nand_correct_data; - nand->ecc.mode = NAND_ECC_HW; - nand->ecc.size = CONFIG_SYS_NAND_ECCSIZE; - nand->ecc.bytes = CONFIG_SYS_NAND_ECCBYTES; -#else - nand->ecc.mode = NAND_ECC_SOFT; -#endif - -#ifdef CONFIG_S3C2410_NAND_BBT - nand->options = NAND_USE_FLASH_BBT; -#else - nand->options = 0; -#endif - - debug("end of nand_init\n"); - - return 0; -} diff --git a/drivers/mtd/nand/s3c24x0_nand.c b/drivers/mtd/nand/s3c24x0_nand.c new file mode 100644 index 0000000..67b44ee --- /dev/null +++ b/drivers/mtd/nand/s3c24x0_nand.c @@ -0,0 +1,268 @@ +/* + * (C) Copyright 2006 OpenMoko, Inc. + * Author: Harald Welte <laforge(a)openmoko.org> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> + +#include <nand.h> +#include <asm/arch/s3c24x0_cpu.h> +#include <asm/io.h> + +#define S3C2410_NFCONF_EN (1<<15) +#define S3C2410_NFCONF_512BYTE (1<<14) +#define S3C2410_NFCONF_4STEP (1<<13) +#define S3C2410_NFCONF_INITECC (1<<12) +#define S3C2410_NFCONF_nFCE (1<<11) +#define S3C2410_NFCONF_TACLS(x) ((x)<<8) +#define S3C2410_NFCONF_TWRPH0(x) ((x)<<4) +#define S3C2410_NFCONF_TWRPH1(x) ((x)<<0) + +#define S3C2410_ADDR_NALE 4 +#define S3C2410_ADDR_NCLE 8 + +#define S3C2440_NFCONT_INITECC (1<<4) +#define S3C2440_NFCONF_nFCE (1<<1) +#define S3C2440_ADDR_NALE 0x8 +#define S3C2440_ADDR_NCLE 0xC + +#ifdef CONFIG_NAND_SPL + +/* in the early stage of NAND flash booting, printf() is not available */ +#define printf(fmt, args...) + +static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) +{ + int i; + struct nand_chip *this = mtd->priv; + + for (i = 0; i < len; i++) + buf[i] = readb(this->IO_ADDR_R); +} +#endif + +#ifdef CONFIG_S3C2440 +static void s3c2440_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) +{ + struct nand_chip *chip = mtd->priv; + struct s3c24x0_nand *nand = s3c24x0_get_base_nand(); + + + debug("hwcontrol(): 0x%02x 0x%02x\n", cmd, ctrl); + + if (ctrl & NAND_CTRL_CHANGE) { + ulong IO_ADDR_W = (ulong)nand; + + if (!(ctrl & NAND_CLE)) + IO_ADDR_W |= S3C2440_ADDR_NCLE; + if (!(ctrl & NAND_ALE)) + IO_ADDR_W |= S3C2440_ADDR_NALE; + + chip->IO_ADDR_W = (void *)IO_ADDR_W; + + if (ctrl & NAND_NCE) + writel(readl(&nand->nfcont) & ~S3C2440_NFCONF_nFCE, + &nand->nfcont); + else + writel(readl(&nand->nfcont) | S3C2440_NFCONF_nFCE, + &nand->nfcont); + } + + if (cmd != NAND_CMD_NONE) + writeb(cmd, chip->IO_ADDR_W); +} + +static int s3c2440_dev_ready(struct mtd_info *mtd) +{ + struct s3c24x0_nand *nand = s3c24x0_get_base_nand(); + debug("dev_ready\n"); + return readl(&nand->nfstat) & 0x01; +} +#else +static void s3c2410_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) +{ + struct nand_chip *chip = mtd->priv; + struct s3c24x0_nand *nand = s3c24x0_get_base_nand(); + + + debug("hwcontrol(): 0x%02x 0x%02x\n", cmd, ctrl); + + if (ctrl & NAND_CTRL_CHANGE) { + ulong IO_ADDR_W = (ulong)nand; + + if (!(ctrl & NAND_CLE)) + IO_ADDR_W |= S3C2410_ADDR_NCLE; + if (!(ctrl & NAND_ALE)) + IO_ADDR_W |= S3C2410_ADDR_NALE; + + chip->IO_ADDR_W = (void *)IO_ADDR_W; + + if (ctrl & NAND_NCE) + writel(readl(&nand->nfconf) & ~S3C2410_NFCONF_nFCE, + &nand->nfconf); + else + writel(readl(&nand->nfconf) | S3C2410_NFCONF_nFCE, + &nand->nfconf); + } + + if (cmd != NAND_CMD_NONE) + writeb(cmd, chip->IO_ADDR_W); +} + +static int s3c2410_dev_ready(struct mtd_info *mtd) +{ + struct s3c24x0_nand *nand = s3c24x0_get_base_nand(); + debug("dev_ready\n"); + return readl(&nand->nfstat) & 0x01; +} +#endif + +#ifdef CONFIG_SYS_S3C2440_NAND_HWECC +void s3c2440_nand_enable_hwecc(struct mtd_info *mtd, int mode) +{ + struct s3c24x0_nand *nand = s3c24x0_get_base_nand(); + debug("s3c2410_nand_enable_hwecc(%p, %d)\n", mtd, mode); + writel((readl(&nand->nfcont) & ~(1 << 5)) | S3C2440_NFCONT_INITECC, &nand->nfcont); +} + +static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, + u_char *ecc_code) +{ + struct s3c24x0_nand *nand = s3c24x0_get_base_nand(); + unsigned long ecc = readl(&nand->nfmecc0); + + ecc_code[0] = ecc; + ecc_code[1] = ecc >> 8; + ecc_code[2] = ecc >> 16; + debug("s3c2410_nand_calculate_hwecc(%p,): 0x%02x 0x%02x 0x%02x\n", + mtd , ecc_code[0], ecc_code[1], ecc_code[2]); + + return 0; +} + +#elif defined(CONFIG_SYS_S3C2410_NAND_HWECC) +void s3c2410_nand_enable_hwecc(struct mtd_info *mtd, int mode) +{ + struct s3c24x0_nand *nand = s3c24x0_get_base_nand(); + debug("s3c2410_nand_enable_hwecc(%p, %d)\n", mtd, mode); + writel(readl(&nand->nfconf) | S3C2410_NFCONF_INITECC, &nand->nfconf); +} + +static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, + u_char *ecc_code) +{ + struct s3c24x0_nand *nand = s3c24x0_get_base_nand(); + ecc_code[0] = readb(&nand->nfecc); + ecc_code[1] = readb(&nand->nfecc + 1); + ecc_code[2] = readb(&nand->nfecc + 2); + debug("s3c2410_nand_calculate_hwecc(%p,): 0x%02x 0x%02x 0x%02x\n", + mtd , ecc_code[0], ecc_code[1], ecc_code[2]); + + return 0; +} +#endif + +static int s3c24x0_nand_correct_data(struct mtd_info *mtd, u_char *dat, + u_char *read_ecc, u_char *calc_ecc) +{ + if (read_ecc[0] == calc_ecc[0] && + read_ecc[1] == calc_ecc[1] && + read_ecc[2] == calc_ecc[2]) + return 0; + + printf("s3c2410_nand_correct_data: not implemented\n"); + return -1; +} + +int board_nand_init(struct nand_chip *nand) +{ + u_int8_t tacls, twrph0, twrph1; + struct s3c24x0_clock_power *clk_power = s3c24x0_get_base_clock_power(); + struct s3c24x0_nand *nand_reg = s3c24x0_get_base_nand(); + + debug("board_nand_init()\n"); + + writel(readl(&clk_power->clkcon) | (1 << 4), &clk_power->clkcon); + + /* initialize hardware */ +#if defined(CONFIG_S3C24XX_CUSTOM_NAND_TIMING) + tacls = CONFIG_S3C24XX_TACLS; + twrph0 = CONFIG_S3C24XX_TWRPH0; + twrph1 = CONFIG_S3C24XX_TWRPH1; +#else + tacls = 4; + twrph0 = 8; + twrph1 = 8; +#endif + +#ifdef CONFIG_S3C2440 + writel(readl(&nand_reg->nfconf) | ((tacls-1)<<12)|((twrph0 - 1)<<8)|((twrph1 - 1)<<4)|(0<<0), &nand_reg->nfconf); + writel((0<<13)|(0<<12)|(0<<10)|(0<<9)|(0<<8)|(1<<6)|(1<<5)|(1<<4)|(1<<1)|(1<<0), &nand_reg->nfcont); +#else + writel(S3C2410_NFCONF_EN|S3C2410_NFCONF_TACLS(tacls - 1)|S3C2410_NFCONF_TWRPH0(twrph0 - 1)|S3C2410_NFCONF_TWRPH1(twrph1 - 1) , + &nand_reg->nfconf); +#endif + /* initialize nand_chip data structure */ + nand->IO_ADDR_R = (void *)&nand_reg->nfdata; + nand->IO_ADDR_W = (void *)&nand_reg->nfdata; + + nand->select_chip = NULL; + + /* read_buf and write_buf are default */ + /* read_byte and write_byte are default */ +#ifdef CONFIG_NAND_SPL + nand->read_buf = nand_read_buf; +#endif + + /* hwcontrol always must be implemented */ +#ifdef CONFIG_S3C2440 + nand->cmd_ctrl = s3c2440_hwcontrol; + nand->dev_ready = s3c2440_dev_ready; +#else + nand->cmd_ctrl = s3c2410_hwcontrol; + nand->dev_ready = s3c2410_dev_ready; +#endif + +#ifdef CONFIG_SYS_S3C2440_NAND_HWECC + nand->ecc.hwctl = s3c2440_nand_enable_hwecc; + nand->ecc.calculate = s3c2440_nand_calculate_ecc; + nand->ecc.correct = s3c24x0_nand_correct_data; + nand->ecc.mode = NAND_ECC_HW; + nand->ecc.size = CONFIG_SYS_NAND_ECCSIZE; + nand->ecc.bytes = CONFIG_SYS_NAND_ECCBYTES; +#elif defined(CONFIG_SYS_S3C2410_NAND_HWECC) + nand->ecc.hwctl = s3c2410_nand_enable_hwecc; + nand->ecc.calculate = s3c2410_nand_calculate_ecc; + nand->ecc.correct = s3c24x0_nand_correct_data; + nand->ecc.mode = NAND_ECC_HW; + nand->ecc.size = CONFIG_SYS_NAND_ECCSIZE; + nand->ecc.bytes = CONFIG_SYS_NAND_ECCBYTES; +#else + nand->ecc.mode = NAND_ECC_SOFT; +#endif + +#ifdef CONFIG_S3C2410_NAND_BBT + nand->options = NAND_USE_FLASH_BBT; +#else + nand->options = 0; +#endif + + debug("end of nand_init\n"); + + return 0; +} -- 1.7.7.1.msysgit.0

4 7

[U-Boot] (no subject)
by Eric Nelson 26 Apr '12

26 Apr '12

These two patches split the previous patch http://lists.denx.de/pipermail/u-boot/2012-March/120150.html into two parts. The first is board-independent and will be useful on all i.MX6 boards. The second is specific to the mx6qsabrelite board.

2 8

[U-Boot] [PATCH] CONFIG_SYS_BAUDRATE_TABLE: Place default into <config.h>
by Tom Rini 26 Apr '12

26 Apr '12

We provide a default table of { 9600, 19200, 38400, 57600, 115200 } at the end of config.h (via mkconfig) when the board has not set a table of its own. A number of boards set values below 9600 but it is my belief that this was done for completeness rather than as a requirement so they have opted to the new default table. Signed-off-by: Tom Rini <trini(a)ti.com> --- include/config_cmd_defaults.h | 1 - include/configs/AP1000.h | 1 - include/configs/APC405.h | 1 - include/configs/AR405.h | 1 - include/configs/ASH405.h | 1 - include/configs/Alaska8220.h | 1 - include/configs/BC3450.h | 1 - include/configs/CANBT.h | 1 - include/configs/CATcenter.h | 1 - include/configs/CMS700.h | 1 - include/configs/CPCI2DP.h | 1 - include/configs/CPCI405.h | 1 - include/configs/CPCI4052.h | 1 - include/configs/CPCI405AB.h | 1 - include/configs/CPCI405DT.h | 1 - include/configs/CPCI750.h | 1 - include/configs/CPCIISER4.h | 1 - include/configs/CRAYL1.h | 1 - include/configs/DB64360.h | 1 - include/configs/DB64460.h | 1 - include/configs/DP405.h | 1 - include/configs/DU405.h | 1 - include/configs/EVB64260.h | 1 - include/configs/EXBITGEN.h | 1 - include/configs/G2000.h | 1 - include/configs/HH405.h | 1 - include/configs/HUB405.h | 1 - include/configs/IceCube.h | 1 - include/configs/JSE.h | 1 - include/configs/MIP405.h | 1 - include/configs/ML2.h | 1 - include/configs/MPC8260ADS.h | 1 - include/configs/MPC8266ADS.h | 1 - include/configs/MVBC_P.h | 1 - include/configs/MVSMR.h | 1 - include/configs/MigoR.h | 1 - include/configs/OCRTC.h | 1 - include/configs/ORSG.h | 1 - include/configs/P3G4.h | 1 - include/configs/PATI.h | 1 - include/configs/PCI405.h | 1 - include/configs/PCI5441.h | 1 - include/configs/PIP405.h | 1 - include/configs/PK1C20.h | 1 - include/configs/PLU405.h | 1 - include/configs/PM520.h | 1 - include/configs/PPChameleonEVB.h | 1 - include/configs/Rattler.h | 1 - include/configs/TB5200.h | 1 - include/configs/TOP5200.h | 1 - include/configs/TOP860.h | 1 - include/configs/TQM5200.h | 1 - include/configs/Total5200.h | 1 - include/configs/VOH405.h | 1 - include/configs/VOM405.h | 1 - include/configs/W7OLMC.h | 1 - include/configs/W7OLMG.h | 1 - include/configs/WUH405.h | 1 - include/configs/Yukon8220.h | 1 - include/configs/ZPC1900.h | 1 - include/configs/ZUMA.h | 1 - include/configs/a4m072.h | 1 - include/configs/actux1.h | 1 - include/configs/actux2.h | 1 - include/configs/actux3.h | 1 - include/configs/actux4.h | 1 - include/configs/aev.h | 1 - include/configs/amcc-common.h | 1 - include/configs/ap325rxa.h | 1 - include/configs/canmb.h | 1 - include/configs/cm5200.h | 1 - include/configs/cmi_mpc5xx.h | 1 - include/configs/cogent_mpc8260.h | 1 - include/configs/cogent_mpc8xx.h | 1 - include/configs/cpci5200.h | 1 - include/configs/csb272.h | 1 - include/configs/csb472.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dvlhost.h | 1 - include/configs/ecovec.h | 1 - include/configs/edminiv2.h | 1 - include/configs/ep8248.h | 1 - include/configs/ep82xxm.h | 1 - include/configs/espt.h | 1 - include/configs/galaxy5200.h | 1 - include/configs/gr_cpci_ax2000.h | 1 - include/configs/gr_ep2s60.h | 1 - include/configs/gr_xc3s_1500.h | 1 - include/configs/grsim.h | 1 - include/configs/grsim_leon2.h | 1 - include/configs/gth2.h | 1 - include/configs/hmi1001.h | 1 - include/configs/hymod.h | 1 - include/configs/inka4x0.h | 1 - include/configs/ipek01.h | 1 - include/configs/jupiter.h | 1 - include/configs/km/keymile-common.h | 1 - include/configs/lwmon.h | 1 - include/configs/manroland/mpc5200-common.h | 1 - include/configs/mcc200.h | 1 - include/configs/mecp5200.h | 1 - include/configs/microblaze-generic.h | 1 - include/configs/motionpro.h | 1 - include/configs/mpr2.h | 1 - include/configs/ms7720se.h | 1 - include/configs/ms7722se.h | 1 - include/configs/muas3001.h | 1 - include/configs/munices.h | 1 - include/configs/mv-common.h | 1 - include/configs/nios2-generic.h | 1 - include/configs/o2dnt.h | 1 - include/configs/omap3_zoom2.h | 1 - include/configs/openrisc-generic.h | 1 - include/configs/p3mx.h | 1 - include/configs/p3p440.h | 1 - include/configs/pcm030.h | 1 - include/configs/pf5200.h | 1 - include/configs/quad100hd.h | 1 - include/configs/rsk7203.h | 1 - include/configs/rsk7264.h | 1 - include/configs/sbc405.h | 1 - include/configs/sc3.h | 1 - include/configs/sh7757lcr.h | 1 - include/configs/sh7763rdp.h | 1 - include/configs/sh7785lcr.h | 1 - include/configs/sorcery.h | 1 - include/configs/spieval.h | 1 - include/configs/v38b.h | 1 - include/configs/xilinx-ppc.h | 2 -- include/configs/xpedite1000.h | 1 - include/configs/zeus.h | 1 - mkconfig | 5 +++++ 132 files changed, 5 insertions(+), 132 deletions(-) diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h index e11205d..a55b268 100644 --- a/include/config_cmd_defaults.h +++ b/include/config_cmd_defaults.h @@ -14,6 +14,5 @@ #define CONFIG_CMD_EXPORTENV 1 #define CONFIG_CMD_GO 1 #define CONFIG_CMD_IMPORTENV 1 -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #endif diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h index b598371..fd074fb 100644 --- a/include/configs/AP1000.h +++ b/include/configs/AP1000.h @@ -142,7 +142,6 @@ #define CONFIG_SYS_INIT_CHAN2 0 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/APC405.h b/include/configs/APC405.h index 88fba5c..9a65cbc 100644 --- a/include/configs/APC405.h +++ b/include/configs/APC405.h @@ -186,7 +186,6 @@ #define CONFIG_SYS_EXT_SERIAL_CLOCK 14745600 /* use external serial clock */ /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/AR405.h b/include/configs/AR405.h index 50796af..9994476 100644 --- a/include/configs/AR405.h +++ b/include/configs/AR405.h @@ -137,7 +137,6 @@ #define CONFIG_SYS_EXT_SERIAL_CLOCK 14745600 /* use external serial clock */ /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h index 0f79f1e..7f48499 100644 --- a/include/configs/ASH405.h +++ b/include/configs/ASH405.h @@ -135,7 +135,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h index 015027d..39c29ec 100644 --- a/include/configs/Alaska8220.h +++ b/include/configs/Alaska8220.h @@ -62,7 +62,6 @@ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index 73925cd..8a73a9a 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -75,7 +75,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h index 70b2215..be9238e 100644 --- a/include/configs/CANBT.h +++ b/include/configs/CANBT.h @@ -111,7 +111,6 @@ #define CONFIG_SYS_EXT_SERIAL_CLOCK 14745600 /* use external serial clock */ /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h index 4d6d56a..84e4e78 100644 --- a/include/configs/CATcenter.h +++ b/include/configs/CATcenter.h @@ -194,7 +194,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h index e73be59..63d838f 100644 --- a/include/configs/CMS700.h +++ b/include/configs/CMS700.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 20e5113..afe8d6e 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -123,7 +123,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h index a024e2b..cf1d1b3 100644 --- a/include/configs/CPCI405.h +++ b/include/configs/CPCI405.h @@ -136,7 +136,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 21b5d6f..d17458e 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -145,7 +145,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h index 856583c..a0d16d2 100644 --- a/include/configs/CPCI405AB.h +++ b/include/configs/CPCI405AB.h @@ -144,7 +144,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h index 4a7363f..98b8ef5 100644 --- a/include/configs/CPCI405DT.h +++ b/include/configs/CPCI405DT.h @@ -146,7 +146,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h index 3768934..a6af86c 100644 --- a/include/configs/CPCI750.h +++ b/include/configs/CPCI750.h @@ -239,7 +239,6 @@ #define CONFIG_SYS_HZ 1000 /* decr freq: 1ms ticks */ #define CONFIG_SYS_BUS_CLK 133000000 /* 133 MHz (CPU = 5*Bus = 666MHz) */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_TCLK 133000000 diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h index 35c1801..35daed0 100644 --- a/include/configs/CPCIISER4.h +++ b/include/configs/CPCIISER4.h @@ -120,7 +120,6 @@ #define CONFIG_SYS_EXT_SERIAL_CLOCK 1843200 /* use external serial clock */ /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index 8fde1a3..4aaceb7 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -140,7 +140,6 @@ * drives the system clock. */ #define CONFIG_SYS_BASE_BAUD 403225 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h index 96b2ecf..c3f3a24 100644 --- a/include/configs/DB64360.h +++ b/include/configs/DB64360.h @@ -328,7 +328,6 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" #define CONFIG_SYS_TCLK 133000000 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_750FX_HID0 0x8000c084 diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h index 0d77fcf..d48f092 100644 --- a/include/configs/DB64460.h +++ b/include/configs/DB64460.h @@ -266,7 +266,6 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" #define CONFIG_SYS_TCLK 133000000 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_750FX_HID0 0x8000c084 diff --git a/include/configs/DP405.h b/include/configs/DP405.h index 7432de1..f6e2652 100644 --- a/include/configs/DP405.h +++ b/include/configs/DP405.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/DU405.h b/include/configs/DU405.h index 69868c6..24df85a 100644 --- a/include/configs/DU405.h +++ b/include/configs/DU405.h @@ -124,7 +124,6 @@ #define CONFIG_SYS_EXT_SERIAL_CLOCK 11059200 /* use external serial clock */ /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h index 3aec672..b905402 100644 --- a/include/configs/EVB64260.h +++ b/include/configs/EVB64260.h @@ -145,7 +145,6 @@ #define CONFIG_SYS_HZ 1000 /* decr freq: 1ms ticks */ #define CONFIG_SYS_BUS_CLK 100000000 /* 100 MHz */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #ifdef CONFIG_EVB64260_750CX diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h index 2eeae6c..43c8842 100644 --- a/include/configs/EXBITGEN.h +++ b/include/configs/EXBITGEN.h @@ -125,7 +125,6 @@ #define CONFIG_BAUDRATE 115200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/G2000.h b/include/configs/G2000.h index 88c368d..d64dd8d 100644 --- a/include/configs/G2000.h +++ b/include/configs/G2000.h @@ -162,7 +162,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/HH405.h b/include/configs/HH405.h index 7cea807..4a41b5c 100644 --- a/include/configs/HH405.h +++ b/include/configs/HH405.h @@ -187,7 +187,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h index d22434a..afb8273 100644 --- a/include/configs/HUB405.h +++ b/include/configs/HUB405.h @@ -129,7 +129,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 93c36cc..135ef55 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -53,7 +53,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/JSE.h b/include/configs/JSE.h index 46c2e07..ef652b2 100644 --- a/include/configs/JSE.h +++ b/include/configs/JSE.h @@ -205,7 +205,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index f3f9d89..9961fb5 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -189,7 +189,6 @@ #define CONFIG_SYS_BASE_BAUD 916667 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/ML2.h b/include/configs/ML2.h index 64cacff..4df9f4c 100644 --- a/include/configs/ML2.h +++ b/include/configs/ML2.h @@ -149,7 +149,6 @@ #define CONFIG_SYS_INIT_CHAN2 1 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index fd6d8c4..e4ea178 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -305,7 +305,6 @@ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_FLASH_BASE 0xff800000 diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index 767fa33..0474140 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -246,7 +246,6 @@ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_FLASH_BASE 0xFE000000 diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h index a63c575..ade4893 100644 --- a/include/configs/MVBC_P.h +++ b/include/configs/MVBC_P.h @@ -47,7 +47,6 @@ #define CONFIG_PSC_CONSOLE 1 #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200, 230400} #define CONFIG_PCI 1 diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h index 9457bd3..f94ad5c 100644 --- a/include/configs/MVSMR.h +++ b/include/configs/MVSMR.h @@ -48,7 +48,6 @@ #define CONFIG_PSC_CONSOLE 1 #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200,\ 230400} diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 53af631..619a800 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -65,7 +65,6 @@ #define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */ #define CONFIG_SYS_MAXARGS 16 /* max args accepted for monitor commands */ #define CONFIG_SYS_BARGSIZE 512 /* Buffer size for Boot Arguments passed to kernel */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */ /* SCIF */ diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h index f761450..47110af 100644 --- a/include/configs/OCRTC.h +++ b/include/configs/OCRTC.h @@ -116,7 +116,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h index ab9b89a..9f754c2 100644 --- a/include/configs/ORSG.h +++ b/include/configs/ORSG.h @@ -114,7 +114,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h index 28baadd..f7ef643 100644 --- a/include/configs/P3G4.h +++ b/include/configs/P3G4.h @@ -171,7 +171,6 @@ #define CONFIG_SYS_HZ 1000 /* decr freq: 1ms ticks */ #define CONFIG_SYS_BUS_CLK 133000000 /* 133 MHz */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/PATI.h b/include/configs/PATI.h index d43b401..bf39d00 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -111,7 +111,6 @@ #define CONFIG_SYS_HZ 1000 /* Decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 1250000 } diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h index 0f1b264..6be5c25 100644 --- a/include/configs/PCI405.h +++ b/include/configs/PCI405.h @@ -122,7 +122,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h index 33ffb36..ae5bc2e 100644 --- a/include/configs/PCI5441.h +++ b/include/configs/PCI5441.h @@ -100,7 +100,6 @@ #define CONFIG_SYS_NIOS_FIXEDBAUD 1 /* Baudrate is fixed */ #define CONFIG_BAUDRATE 115200 /* Initial baudrate */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE {115200} /* It's fixed ;-) */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* Suppress console info*/ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 9a93396..242aa31 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -182,7 +182,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h index f668d1d..3fe2b3e 100644 --- a/include/configs/PK1C20.h +++ b/include/configs/PK1C20.h @@ -102,7 +102,6 @@ #define CONFIG_SYS_NIOS_FIXEDBAUD 1 /* Baudrate is fixed */ #define CONFIG_BAUDRATE 115200 /* Initial baudrate */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE {115200} /* It's fixed ;-) */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1 /* Suppress console info*/ diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 1692ed1..1cce57e 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -146,7 +146,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/PM520.h b/include/configs/PM520.h index 7addabb..9b01e4f 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -46,7 +46,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 9600 /* ... at 9600 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index 5fa5ac5..2d45618 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -203,7 +203,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h index 4cedf07..9ddf626 100644 --- a/include/configs/Rattler.h +++ b/include/configs/Rattler.h @@ -189,7 +189,6 @@ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_FLASH_BASE 0xFE000000 diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index 96b562c..feaadf3 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -59,7 +59,6 @@ #define CONFIG_SERIAL_MULTI 1 /* support multiple consoles */ #define CONFIG_PSC_CONSOLE2 6 /* second console is on PSC6 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h index e2e392c..2267d59 100644 --- a/include/configs/TOP5200.h +++ b/include/configs/TOP5200.h @@ -62,7 +62,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 9600 /* ... at 9600 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h index 7136233..3a01292 100644 --- a/include/configs/TOP860.h +++ b/include/configs/TOP860.h @@ -198,7 +198,6 @@ #define I2C_TRISTATE { __I2C_DIR &= ~SDA; } #endif -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /*----------------------------------------------------------------------- diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index f7f3736..6ea3faa 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -63,7 +63,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_BOOTCOUNT_LIMIT 1 diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h index a1d51e9..16b2dac 100644 --- a/include/configs/Total5200.h +++ b/include/configs/Total5200.h @@ -63,7 +63,6 @@ */ #define CONFIG_PSC_CONSOLE 3 /* console is on PSC3 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h index 621ea3f..5b8f41f 100644 --- a/include/configs/VOH405.h +++ b/include/configs/VOH405.h @@ -144,7 +144,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index 36840cc..2ca4ed0 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -131,7 +131,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h index 58cd064..1d97d3e 100644 --- a/include/configs/W7OLMC.h +++ b/include/configs/W7OLMC.h @@ -138,7 +138,6 @@ /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE {9600} #define CONFIG_SYS_LOAD_ADDR 0x100000 /* default load address */ diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h index 4676ce7..93caacc 100644 --- a/include/configs/W7OLMG.h +++ b/include/configs/W7OLMG.h @@ -146,7 +146,6 @@ /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE {9600} #define CONFIG_SYS_LOAD_ADDR 0x100000 /* default load address */ diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h index eeb4088..504ad96 100644 --- a/include/configs/WUH405.h +++ b/include/configs/WUH405.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h index 3baa02c..5f925b3 100644 --- a/include/configs/Yukon8220.h +++ b/include/configs/Yukon8220.h @@ -62,7 +62,6 @@ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 924b694..4cda22f 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -173,7 +173,6 @@ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_SDRAM_BASE 0x00000000 diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h index 72995bc..5350f61 100644 --- a/include/configs/ZUMA.h +++ b/include/configs/ZUMA.h @@ -167,7 +167,6 @@ #define CONFIG_SYS_BUS_CLK 133000000 /* 133 MHz */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index ef38102..1c13904 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -50,7 +50,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 9600 /* ... at 9600 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* define to enable silent console */ #define CONFIG_SILENT_CONSOLE diff --git a/include/configs/actux1.h b/include/configs/actux1.h index a52e4da..bdd2239 100644 --- a/include/configs/actux1.h +++ b/include/configs/actux1.h @@ -101,7 +101,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x00010000 /* valid baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400 } #define CONFIG_SERIAL_RTS_ACTIVE 1 diff --git a/include/configs/actux2.h b/include/configs/actux2.h index f72a942..c55571c 100644 --- a/include/configs/actux2.h +++ b/include/configs/actux2.h @@ -94,7 +94,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x00010000 /* valid baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400 } #define CONFIG_SERIAL_RTS_ACTIVE 1 diff --git a/include/configs/actux3.h b/include/configs/actux3.h index 586642d..78ee2b5 100644 --- a/include/configs/actux3.h +++ b/include/configs/actux3.h @@ -92,7 +92,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x00010000 /* valid baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400 } #define CONFIG_SERIAL_RTS_ACTIVE 1 diff --git a/include/configs/actux4.h b/include/configs/actux4.h index 67362e5..c1105df 100644 --- a/include/configs/actux4.h +++ b/include/configs/actux4.h @@ -99,7 +99,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x00010000 /* valid baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400 } #define CONFIG_SERIAL_RTS_ACTIVE 1 diff --git a/include/configs/aev.h b/include/configs/aev.h index 5678773..8d0890f 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -59,7 +59,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index a9e1be8..76ef56f 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -37,7 +37,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 95774e0..42a134b 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -77,7 +77,6 @@ /* Buffer size for Boot Arguments passed to kernel */ #define CONFIG_SYS_BARGSIZE 512 /* List of legal baudrate settings for this board */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 38400 } /* SCIF */ diff --git a/include/configs/canmb.h b/include/configs/canmb.h index e473e7a..d4c5bbd 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -51,7 +51,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index e1b3830..0abe090 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -60,7 +60,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 57600 /* ... at 57600 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SILENT_CONSOLE 1 /* needed to silence i2c_init() */ diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h index f312cad..329e4e3 100644 --- a/include/configs/cmi_mpc5xx.h +++ b/include/configs/cmi_mpc5xx.h @@ -114,7 +114,6 @@ #define CONFIG_SYS_HZ 1000 /* Decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 1250000 } diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h index c800753..2997f52 100644 --- a/include/configs/cogent_mpc8260.h +++ b/include/configs/cogent_mpc8260.h @@ -157,7 +157,6 @@ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h index 10c91e3..58aa88b 100644 --- a/include/configs/cogent_mpc8xx.h +++ b/include/configs/cogent_mpc8xx.h @@ -122,7 +122,6 @@ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_ALLOC_DPRAM diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h index a31bf42..a9cfe26 100644 --- a/include/configs/cpci5200.h +++ b/include/configs/cpci5200.h @@ -58,7 +58,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 9600 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/csb272.h b/include/configs/csb272.h index f0b8494..fb5f868 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -171,7 +171,6 @@ #define CONFIG_SYS_EXT_SERIAL_CLOCK 3868400 /* use external serial clock */ #undef CONFIG_SYS_BASE_BAUD #define CONFIG_BAUDRATE 38400 /* Default baud rate */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/csb472.h b/include/configs/csb472.h index cf54fcb..5d18ac7 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -170,7 +170,6 @@ #undef CONFIG_SYS_EXT_SERIAL_CLOCK /* use internal serial clock */ #define CONFIG_SYS_BASE_BAUD 691200 #define CONFIG_BAUDRATE 38400 /* Default baud rate */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 400454f..d517334 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -59,7 +59,6 @@ */ #define CONFIG_PSC_CONSOLE 4 /* console is on PSC4 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400 } diff --git a/include/configs/dvlhost.h b/include/configs/dvlhost.h index 89c59b7..4eda91e 100644 --- a/include/configs/dvlhost.h +++ b/include/configs/dvlhost.h @@ -100,7 +100,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x00010000 /* valid baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400 } #define CONFIG_SERIAL_RTS_ACTIVE 1 diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 6f20827..4d09132 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -117,7 +117,6 @@ /* Buffer size for Boot Arguments passed to kernel */ #define CONFIG_SYS_BARGSIZE 512 /* List of legal baudrate settings for this board */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* SCIF */ diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 9e9b25b..9b7cc66 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -95,7 +95,6 @@ #define CONFIG_CONS_INDEX 1 /*Console on UART0 */ #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h index a88e910..2b40f59 100644 --- a/include/configs/ep8248.h +++ b/include/configs/ep8248.h @@ -173,7 +173,6 @@ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_FLASH_BASE 0xFF800000 diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h index fa44708..04c0708 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -184,7 +184,6 @@ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /*----------------------------------------------------------------------- diff --git a/include/configs/espt.h b/include/configs/espt.h index 8ce297d..3df1fae 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -65,7 +65,6 @@ #define CONFIG_SYS_MAXARGS 16 /* max args accepted for monitor commands */ #define CONFIG_SYS_BARGSIZE 512 /* Buffer size for Boot Arguments passed to kernel */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */ diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h index 9249533..a38298f 100644 --- a/include/configs/galaxy5200.h +++ b/include/configs/galaxy5200.h @@ -65,7 +65,6 @@ /* register later on to */ /* enable UART function! */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index d37b39f..dd6c41d 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -67,7 +67,6 @@ * Serial console configuration */ #define CONFIG_BAUDRATE 38400 /* ... at 38400 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 85f1b03..7068ff8 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -61,7 +61,6 @@ * Serial console configuration */ #define CONFIG_BAUDRATE 38400 /* ... at 38400 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index 8b8a3fb..5006322 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -48,7 +48,6 @@ * Serial console configuration */ #define CONFIG_BAUDRATE 38400 /* ... at 38400 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/grsim.h b/include/configs/grsim.h index 6bdd35d..f3639dd 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -55,7 +55,6 @@ * Serial console configuration */ #define CONFIG_BAUDRATE 38400 /* ... at 38400 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 6d5044c..fb9a3f9 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -54,7 +54,6 @@ * Serial console configuration */ #define CONFIG_BAUDRATE 38400 /* ... at 38400 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/gth2.h b/include/configs/gth2.h index 077079c..76e911a 100644 --- a/include/configs/gth2.h +++ b/include/configs/gth2.h @@ -49,7 +49,6 @@ #define CONFIG_BAUDRATE 115200 /* valid baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* Only interrupt boot if space is pressed */ diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h index 2e680e5..354072a 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -48,7 +48,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ diff --git a/include/configs/hymod.h b/include/configs/hymod.h index 1e80ec0..8c9f3d1 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -289,7 +289,6 @@ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_I2C_SPEED 50000 diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index c62cf67..2b0b616 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -57,7 +57,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index db5c7e1..cfa4d8c 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -53,7 +53,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 9600 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index e338b66..f5adccb 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -54,7 +54,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index f6208ca..7a01705 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -78,7 +78,6 @@ #define CONFIG_SYS_HZ 1000 /* decr. freq: 1 ms ticks */ #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_LOADS_ECHO diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index e308448..405bc69 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -242,7 +242,6 @@ * When the watchdog is enabled, output must be fast enough in Linux. */ #ifdef CONFIG_WATCHDOG -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 38400, 57600, 115200 } #endif diff --git a/include/configs/manroland/mpc5200-common.h b/include/configs/manroland/mpc5200-common.h index 2addd34..3e4131e 100644 --- a/include/configs/manroland/mpc5200-common.h +++ b/include/configs/manroland/mpc5200-common.h @@ -39,7 +39,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200,\ 230400 } diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index c67dfaa..b56b273 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -88,7 +88,6 @@ #error "Select only one console device!" #endif #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_MII 1 diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h index 9652a6e..22e95b3 100644 --- a/include/configs/mecp5200.h +++ b/include/configs/mecp5200.h @@ -62,7 +62,6 @@ #else #define CONFIG_BAUDRATE 9600 /* ... at 115200 bps */ #endif -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_MII diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 25a815c..efca136 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -36,7 +36,6 @@ # define CONFIG_XILINX_UARTLITE # define CONFIG_SERIAL_BASE XILINX_UARTLITE_BASEADDR # define CONFIG_BAUDRATE XILINX_UARTLITE_BAUDRATE -# undef CONFIG_SYS_BAUDRATE_TABLE # define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } # define CONSOLE_ARG "console=console=ttyUL0,115200\0" #elif XILINX_UART16550_BASEADDR diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index fdeebc8..bdcae59 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -75,7 +75,6 @@ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_NETCONSOLE 1 /* network console */ #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index 3d7c820..0f7edff 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */ #define CONFIG_SYS_MAXARGS 16 /* max args accepted for monitor commands */ #define CONFIG_SYS_BARGSIZE 512 /* Buffer size for Boot Arguments passed to kernel */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index de77aa2..afa82cf 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -61,7 +61,6 @@ /* Buffer size for Boot Arguments passed to kernel */ #define CONFIG_SYS_BARGSIZE 512 /* List of legal baudrate settings for this board */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* SCIF */ diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index f5d6731..7cf641f 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -63,7 +63,6 @@ #define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */ #define CONFIG_SYS_MAXARGS 16 /* max args accepted for monitor commands */ #define CONFIG_SYS_BARGSIZE 512 /* Buffer size for Boot Arguments passed to kernel */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */ /* SCIF */ diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h index 0e14dce..18bd37e 100644 --- a/include/configs/muas3001.h +++ b/include/configs/muas3001.h @@ -215,7 +215,6 @@ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_SYS_SDRAM_BASE 0x00000000 diff --git a/include/configs/munices.h b/include/configs/munices.h index a0296d8..425a1d8 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -61,7 +61,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 229ba5d..1a63791 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -70,7 +70,6 @@ #define CONFIG_CONS_INDEX 1 /*Console on UART0 */ #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200,230400, 460800, 921600 } /* auto boot */ diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 6863576..17017a5 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -46,7 +46,6 @@ #define CONFIG_ALTERA_JTAG_UART_BYPASS #define CONFIG_SYS_NIOS_FIXEDBAUD #define CONFIG_BAUDRATE CONFIG_SYS_UART_BAUD -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE {CONFIG_BAUDRATE} #define CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress console info */ diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h index cce2b63..22eb004 100644 --- a/include/configs/o2dnt.h +++ b/include/configs/o2dnt.h @@ -43,7 +43,6 @@ */ #define CONFIG_PSC_CONSOLE 5 /* console is on PSC5 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 3a2d849..b60ece3 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -89,7 +89,6 @@ #define CONFIG_SYS_NS16550_REG_SIZE (-2) #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE {115200} /* allow to overwrite serial and ethaddr */ diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h index ac4e5fc..5ff410d 100644 --- a/include/configs/openrisc-generic.h +++ b/include/configs/openrisc-generic.h @@ -55,7 +55,6 @@ # define CONFIG_SYS_NS16550_CLK CONFIG_SYS_CLK_FREQ #define CONFIG_BAUDRATE CONFIG_SYS_UART_BAUD -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE {CONFIG_BAUDRATE} #define CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress console info */ #define CONSOLE_ARG "console=console=ttyS0,115200\0" diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h index c70cc6b..e44009e 100644 --- a/include/configs/p3mx.h +++ b/include/configs/p3mx.h @@ -108,7 +108,6 @@ #define CONFIG_MPSC /* MV64460 Serial */ #define CONFIG_MPSC_PORT 0 #define CONFIG_BAUDRATE 115200 /* console baudrate */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index ff1468b..d7b1ca2 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -90,7 +90,6 @@ #undef CONFIG_SYS_EXT_SERIAL_CLOCK #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 0685837..1c4d722 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -62,7 +62,6 @@ Serial console configuration /* register later on to */ /*enable UART function! */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h index 91fefc4..4a98545 100644 --- a/include/configs/pf5200.h +++ b/include/configs/pf5200.h @@ -60,7 +60,6 @@ #else #define CONFIG_BAUDRATE 9600 /* ... at 115200 bps */ #endif -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h index ea282a6..dc5ec3a 100644 --- a/include/configs/quad100hd.h +++ b/include/configs/quad100hd.h @@ -117,7 +117,6 @@ #define CONFIG_SERIAL_MULTI /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index e7a8c41..59b45c8 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -63,7 +63,6 @@ /* Buffer size for Boot Arguments passed to kernel */ #define CONFIG_SYS_BARGSIZE 512 /* List of legal baudrate settings for this board */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* SCIF */ diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h index 3a25b30..af9524e 100644 --- a/include/configs/rsk7264.h +++ b/include/configs/rsk7264.h @@ -26,7 +26,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC3,115200" #define CONFIG_BOOTDELAY 3 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } #define CONFIG_SYS_LONGHELP 1 /* undef to save memory */ diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h index 2d74235..cab6660 100644 --- a/include/configs/sbc405.h +++ b/include/configs/sbc405.h @@ -158,7 +158,6 @@ #define CONFIG_SYS_BASE_BAUD 691200 /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200, 230400, 460800, 921600 } diff --git a/include/configs/sc3.h b/include/configs/sc3.h index b616456..2d6e51d 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -235,7 +235,6 @@ #define CONFIG_SYS_BASE_BAUD 921600 /* internal clock */ /* The following table includes the supported baudrates */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index 7c3a948..73d2a87 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -73,7 +73,6 @@ #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE 512 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* SCIF */ diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 0a8df7f..59728f5 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -65,7 +65,6 @@ #define CONFIG_SYS_MAXARGS 16 /* max args accepted for monitor commands */ #define CONFIG_SYS_BARGSIZE 512 /* Buffer size for Boot Arguments passed to kernel */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */ diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index e94f913..1e71bcc 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -87,7 +87,6 @@ #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE 512 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* SCIF */ diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h index 3c8b24c..fe40bf0 100644 --- a/include/configs/sorcery.h +++ b/include/configs/sorcery.h @@ -46,7 +46,6 @@ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* PCI */ diff --git a/include/configs/spieval.h b/include/configs/spieval.h index a958fd0..f27466c 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -48,7 +48,6 @@ */ #define CONFIG_PSC_CONSOLE 6 /* console is on PSC6 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #ifdef CONFIG_STK52XX diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 84a5f9d..47bb846 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -54,7 +54,6 @@ */ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index e2173de..bd7bac0 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -121,7 +121,6 @@ #define CONFIG_XILINX_UARTLITE #define CONFIG_SERIAL_BASE XPAR_UARTLITE_0_BASEADDR #define CONFIG_BAUDRATE XPAR_UARTLITE_0_BAUDRATE -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } #else #ifdef XPAR_UARTNS550_0_BASEADDR @@ -132,7 +131,6 @@ #define CONFIG_SYS_NS16550_COM1 XPAR_UARTNS550_0_BASEADDR #define CONFIG_SYS_NS16550_CLK XPAR_UARTNS550_0_CLOCK_FREQ_HZ #define CONFIG_BAUDRATE 115200 -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 115200 } #endif #endif diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index e686891..d72921e 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -118,7 +118,6 @@ extern void out32(unsigned int, unsigned long); #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400} #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/zeus.h b/include/configs/zeus.h index 6535ea2..63279b0 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -133,7 +133,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SERIAL_MULTI -#undef CONFIG_SYS_BAUDRATE_TABLE #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} diff --git a/mkconfig b/mkconfig index 438530b..3f873e5 100755 --- a/mkconfig +++ b/mkconfig @@ -167,6 +167,11 @@ cat << EOF >> config.h #include <config_defaults.h> #include <configs/${CONFIG_NAME}.h> #include <asm/config.h> + +/* Default baud rate table */ +#ifndef CONFIG_SYS_BAUDRATE_TABLE +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#endif EOF exit 0 -- 1.7.0.4

2 1

[U-Boot] yaffs2 u-boot patching support
by Charles Manning 25 Apr '12

25 Apr '12

Hello ubooters and yaffsers I was commissioned to refresh yaffs2 in u-boot and add a mechanism to support dynamic yaffs partition set up (way simpler than screwing around with mtd part) and manual configuration. Rather than do this as a once off, I set this scripting up so that this can be done at any time (painlessly I hope) to bring in the fresh code (as per Linux patching). Basically... Get latest from yaffs git. cd yaffs2-dir/direct/u-boot ./patch-u-boot.sh uboot-dir Edit your u-boot config file and add #define CONFIG_YAFFS2 1 Rebuild u-boot (mrproper probably a Good Idea). Job done. OK, so how does the new dynamic partition stuff work? There are 2 new commands: ydevconfig configures a mount point "partition" and ydevls lists the mount points and their state So for example let us say we want a mount point called foo on NAND device 0 starting at block 55 and ending at block 999. ydevconfig foo 0 55 999 Now you want to mount it. ymount foo Access files and do stuff... yls foo yls -l foo # more info ymkdir foo/dir ... You can have multiple mountpoints in use at the same time though they are not allowed to overlap. inband tags is selected automatically if there is insufficient space in oobavail to store the tags. Have fun. Charles

3 5