April 2009 - U-Boot

[U-Boot] [PATCH] mtd: nand/onenand: Register mtd device upon device scanning
by Stefan Roese 28 Apr '09

28 Apr '09

With this patch the NAND and OneNAND devices are registered in the MTD subsystem and can then be referenced by the mtdcore code (e.g. get_mtd_device_nm()). This is needed for the new "ubi part" command syntax without the flash type parameter (nor|nand|onenand). Signed-off-by: Stefan Roese <sr(a)denx.de> --- drivers/mtd/nand/nand.c | 12 ++++++++++++ drivers/mtd/onenand/onenand_uboot.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c index 9d83794..d369115 100644 --- a/drivers/mtd/nand/nand.c +++ b/drivers/mtd/nand/nand.c @@ -37,11 +37,13 @@ static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE]; static ulong base_address[CONFIG_SYS_MAX_NAND_DEVICE] = CONFIG_SYS_NAND_BASE_LIST; static const char default_nand_name[] = "nand"; +static __attribute__((unused)) char dev_name[CONFIG_SYS_MAX_NAND_DEVICE][8]; static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand, ulong base_addr) { int maxchips = CONFIG_SYS_NAND_MAX_CHIPS; + int __attribute__((unused)) i = 0; if (maxchips < 1) maxchips = 1; @@ -54,6 +56,16 @@ static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand, mtd->name = (char *)default_nand_name; else mtd->name += gd->reloc_off; + +#ifdef CONFIG_MTD_PARTITIONS + /* + * Add MTD device so that we can reference it later + * via the mtdcore infrastructure (e.g. ubi). + */ + sprintf(dev_name[i], "nand%d", i); + mtd->name = dev_name[i++]; + add_mtd_device(mtd); +#endif } else mtd->name = NULL; } else { diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c index 4541b22..a95b922 100644 --- a/drivers/mtd/onenand/onenand_uboot.c +++ b/drivers/mtd/onenand/onenand_uboot.c @@ -20,6 +20,7 @@ struct mtd_info onenand_mtd; struct onenand_chip onenand_chip; +static __attribute__((unused)) char dev_name[] = "onenand0"; void onenand_init(void) { @@ -41,4 +42,13 @@ void onenand_init(void) puts("OneNAND: "); print_size(onenand_mtd.size, "\n"); + +#ifdef CONFIG_MTD_PARTITIONS + /* + * Add MTD device so that we can reference it later + * via the mtdcore infrastructure (e.g. ubi). + */ + onenand_mtd.name = dev_name; + add_mtd_device(&onenand_mtd); +#endif } -- 1.6.2.4

2 1

[U-Boot] [PATCH] mtd: nand: Include linux/mtd/partitions.h in nand_base.h
by Stefan Roese 28 Apr '09

28 Apr '09

This patch removes this compilation warning when CONFIG_MTD_PARTITIONS is defined: nand_base.c: In function 'nand_release': nand_base.c:2922: warning: implicit declaration of function 'del_mtd_partitions' Signed-off-by: Stefan Roese <sr(a)denx.de> --- drivers/mtd/nand/nand_base.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index e6ac859..360b070 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -68,6 +68,10 @@ #include <linux/mtd/nand.h> #include <linux/mtd/nand_ecc.h> +#ifdef CONFIG_MTD_PARTITIONS +#include <linux/mtd/partitions.h> +#endif + #include <asm/io.h> #include <asm/errno.h> -- 1.6.2.4

2 1

[U-Boot] [PATCH] ubi: Remove flash selection parameter (nor|nand|onenand) from "ubi part"
by Stefan Roese 28 Apr '09

28 Apr '09

This patch removes the now unnecessary flash type parameter from the "ubi part" command. Currently the user has to define the type of flash he will be using UBI on. Example: => ubi part nor partition1 With this patch this type parameter is not needed anymore. The user can now select the partition directly without the flash type paramter. Example: => ubi part partition1 This breaks backward compatibility right now because of the change in the command syntax. But UBI support is still quite fresh and the advantage of this new command is syntax big enough for this change. Additionally the code is much cleaner now. Signed-off-by: Stefan Roese <sr(a)denx.de> CC: Kyungmin Park <kyungmin.park(a)samsung.com> --- common/cmd_ubi.c | 73 +++++++++++++++++++---------------------------------- 1 files changed, 26 insertions(+), 47 deletions(-) diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 9c17d71..55b9a72 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -34,9 +34,8 @@ static char buffer[80]; static int ubi_initialized; struct selected_dev { - char dev_name[32]; /* NAND/OneNAND etc */ char part_name[80]; - int type; + int selected; int nr; struct mtd_info *mtd_info; }; @@ -448,19 +447,24 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } if (strcmp(argv[1], "part") == 0) { + char mtd_dev[16]; + struct mtd_device *dev; + struct part_info *part; + u8 pnum; + /* Print current partition */ if (argc == 2) { - if (ubi_dev.type == DEV_TYPE_NONE) { + if (!ubi_dev.selected) { printf("Error, no UBI device/partition selected!\n"); return 1; } - printf("%s Device %d: %s, partition %s\n", ubi_dev.dev_name, + printf("Device %d: %s, partition %s\n", ubi_dev.nr, ubi_dev.mtd_info->name, ubi_dev.part_name); return 0; } - if (argc < 4) { + if (argc < 3) { cmd_usage(cmdtp); return 1; } @@ -477,54 +481,29 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } /* - * Check for nor|nand|onenand selection + * Search the mtd device number where this partition + * is located */ -#if defined(CONFIG_CMD_NAND) - if (strcmp(argv[2], "nand") == 0) { - strcpy(ubi_dev.dev_name, "NAND"); - ubi_dev.type = DEV_TYPE_NAND; - ubi_dev.mtd_info = &nand_info[ubi_dev.nr]; - } -#endif -#if defined(CONFIG_FLASH_CFI_MTD) - if (strcmp(argv[2], "nor") == 0) { - char mtd_dev[16]; - struct mtd_device *dev; - struct part_info *part; - u8 pnum; - - /* - * Search the mtd device number where this partition - * is located - */ - if (find_dev_and_part(argv[3], &dev, &pnum, &part)) { - printf("Partition %s not found!\n", argv[3]); - return 1; - } - sprintf(mtd_dev, "nor%d", dev->id->num); - ubi_dev.mtd_info = get_mtd_device_nm(mtd_dev); - strcpy(ubi_dev.dev_name, "NOR"); - ubi_dev.type = DEV_TYPE_NOR; - } -#endif -#if defined(CONFIG_CMD_ONENAND) - if (strcmp(argv[2], "onenand") == 0) { - strcpy(ubi_dev.dev_name, "OneNAND"); - ubi_dev.type = DEV_TYPE_ONENAND; - ubi_dev.mtd_info = &onenand_mtd; + if (find_dev_and_part(argv[2], &dev, &pnum, &part)) { + printf("Partition %s not found!\n", argv[2]); + return 1; } -#endif - - if (ubi_dev.type == DEV_TYPE_NONE) { - printf("Error, no UBI device/partition selected!\n"); + sprintf(mtd_dev, "%s%d", MTD_DEV_TYPE(dev->id->type), dev->id->num); + printf("%s: mtd_dev=%s!!!\n", __func__, mtd_dev); // test-only + ubi_dev.mtd_info = get_mtd_device_nm(mtd_dev); + printf("%s: mtd_info=%p!!!\n", __func__, ubi_dev.mtd_info); // test-only + if (IS_ERR(ubi_dev.mtd_info)) { + printf("Partition %s not found on device %s!\n", argv[2], mtd_dev); return 1; } - strcpy(ubi_dev.part_name, argv[3]); + ubi_dev.selected = 1; + + strcpy(ubi_dev.part_name, argv[2]); err = ubi_dev_scan(ubi_dev.mtd_info, ubi_dev.part_name); if (err) { printf("UBI init error %d\n", err); - ubi_dev.type = DEV_TYPE_NONE; + ubi_dev.selected = 0; return err; } @@ -533,7 +512,7 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 0; } - if ((strcmp(argv[1], "part") != 0) && (ubi_dev.type == DEV_TYPE_NONE)) { + if ((strcmp(argv[1], "part") != 0) && (!ubi_dev.selected)) { printf("Error, no UBI device/partition selected!\n"); return 1; } @@ -617,7 +596,7 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(ubi, 6, 1, do_ubi, "ubi commands", - "part [nand|nor|onenand] [part]" + "part [part]" " - Show or set current partition\n" "ubi info [l[ayout]]" " - Display volume and ubi layout information\n" -- 1.6.2.4

3 3

[U-Boot] [PATCH] mips/vcth: Use generic 16550 uart driver
by Detlev Zundel 28 Apr '09

28 Apr '09

As the common code also handles baudrate switching, which the board specific vct.c driver did not support, this is one of the rare occassions where deleting code actually adds a feature :) Signed-off-by: Detlev Zundel <dzu(a)denx.de> Acked-by: Stefan Roese <sr(a)denx.de> --- drivers/serial/Makefile | 3 +- drivers/serial/vct.c | 125 ----------------------------------------------- include/configs/vct.h | 13 +++++- 3 files changed, 13 insertions(+), 128 deletions(-) delete mode 100755 drivers/serial/vct.c diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index bb99a34..14c818d 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -1,5 +1,5 @@ # -# (C) Copyright 2006 +# (C) Copyright 2006-2009 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # # See file CREDITS for list of people who contributed to this @@ -50,7 +50,6 @@ COBJS-$(CONFIG_S3C44B0_SERIAL) += serial_s3c44b0.o COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o COBJS-$(CONFIG_USB_TTY) += usbtty.o -COBJS-$(CONFIG_VCT_SERIAL) += vct.o COBJS := $(sort $(COBJS-y)) SRCS := $(COBJS:.o=.c) diff --git a/drivers/serial/vct.c b/drivers/serial/vct.c deleted file mode 100755 index 556c114..0000000 --- a/drivers/serial/vct.c +++ /dev/null @@ -1,125 +0,0 @@ -/* - * (C) Copyright 2008 Stefan Roese <sr(a)denx.de>, DENX Software Engineering - * - * 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 <config.h> -#include <common.h> -#include <asm/io.h> - -#ifdef CONFIG_VCT_PLATINUMAVC -#define UART_1_BASE 0xBDC30000 -#else -#define UART_1_BASE 0xBF89C000 -#endif - -#define UART_RBR_OFF 0x00 /* receiver buffer reg */ -#define UART_THR_OFF 0x00 /* transmit holding reg */ -#define UART_DLL_OFF 0x00 /* divisor latch low reg */ -#define UART_IER_OFF 0x04 /* interrupt enable reg */ -#define UART_DLH_OFF 0x04 /* receiver buffer reg */ -#define UART_FCR_OFF 0x08 /* fifo control register */ -#define UART_LCR_OFF 0x0c /* line control register */ -#define UART_MCR_OFF 0x10 /* modem control register */ -#define UART_LSR_OFF 0x14 /* line status register */ -#define UART_MSR_OFF 0x18 /* modem status register */ -#define UART_SCR_OFF 0x1c /* scratch pad register */ - -#define UART_RCV_DATA_RDY 0x01 /* Data Received */ -#define UART_XMT_HOLD_EMPTY 0x20 -#define UART_TRANSMIT_EMPTY 0x40 - -/* 7 bit on line control reg. enalbing rw to dll and dlh */ -#define UART_LCR_DLAB 0x0080 - -#define UART___9600_BDR 0x84 -#define UART__19200_BDR 0x42 -#define UART_115200_BDR 0x08 - -#define UART_DIS_ALL_INTER 0x00 /* disable all interrupts */ - -#define UART_5DATA_BITS 0x0000 /* 5 [bits] 1.5 bits 2 */ -#define UART_6DATA_BITS 0x0001 /* 6 [bits] 1 bits 2 */ -#define UART_7DATA_BITS 0x0002 /* 7 [bits] 1 bits 2 */ -#define UART_8DATA_BITS 0x0003 /* 8 [bits] 1 bits 2 */ - -static void vct_uart_set_baud_rate(u32 address, u32 dh, u32 dl) -{ - u32 val = __raw_readl(UART_1_BASE + UART_LCR_OFF); - - /* set 7 bit on 1 */ - val |= UART_LCR_DLAB; - __raw_writel(val, UART_1_BASE + UART_LCR_OFF); - - __raw_writel(dl, UART_1_BASE + UART_DLL_OFF); - __raw_writel(dh, UART_1_BASE + UART_DLH_OFF); - - /* set 7 bit on 0 */ - val &= ~UART_LCR_DLAB; - __raw_writel(val, UART_1_BASE + UART_LCR_OFF); - - return; -} - -int serial_init(void) -{ - __raw_writel(UART_DIS_ALL_INTER, UART_1_BASE + UART_IER_OFF); - vct_uart_set_baud_rate(UART_1_BASE, 0, UART_115200_BDR); - __raw_writel(UART_8DATA_BITS, UART_1_BASE + UART_LCR_OFF); - - return 0; -} - -void serial_setbrg(void) -{ - /* - * Baudrate change not supported currently, fixed to 115200 baud - */ -} - -void serial_putc(const char c) -{ - if (c == '\n') - serial_putc('\r'); - - while (!(UART_XMT_HOLD_EMPTY & __raw_readl(UART_1_BASE + UART_LSR_OFF))) - ; - - __raw_writel(c, UART_1_BASE + UART_THR_OFF); -} - -void serial_puts(const char *s) -{ - while (*s) - serial_putc(*s++); -} - -int serial_getc(void) -{ - while (!(UART_RCV_DATA_RDY & __raw_readl(UART_1_BASE + UART_LSR_OFF))) - ; - - return __raw_readl(UART_1_BASE + UART_RBR_OFF) & 0xff; -} - -int serial_tstc(void) -{ - if (!(UART_RCV_DATA_RDY & __raw_readl(UART_1_BASE + UART_LSR_OFF))) - return 0; - - return 1; -} diff --git a/include/configs/vct.h b/include/configs/vct.h index d202522..fe67997 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -61,7 +61,18 @@ /* * UART */ -#define CONFIG_VCT_SERIAL +#ifdef CONFIG_VCT_PLATINUMAVC +#define UART_1_BASE 0xBDC30000 +#else +#define UART_1_BASE 0xBF89C000 +#endif + +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_REG_SIZE -4 +#define CONFIG_SYS_NS16550_COM1 UART_1_BASE +#define CONFIG_CONS_INDEX 1 +#define CONFIG_SYS_NS16550_CLK 921600 #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -- 1.6.0.6

3 2

[U-Boot] [PATCH] video: fix bug in cfb_console.c code
by Anatolij Gustschin 28 Apr '09

28 Apr '09

Fix bug in drawing long version/info strings: U-Boot version string like "U-Boot 2009.03-05647-g7c51e06 (Apr 23 2009 - 12:40:00) MPC83XX" is long and doesn't wrap around correctly while drawing beside the logo. Such long strings partially overwrite the logo. This patch is an attempt to fix it. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- drivers/video/cfb_console.c | 36 +++++++++++++++++++++++++++++++++--- include/configs/MPC8360ERDK.h | 2 +- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 0b5a0ee..f2a06b5 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1188,6 +1188,7 @@ static void *video_logo (void) { char info[128]; extern char version_string; + int space, len, y_off = 0; #ifdef CONFIG_SPLASH_SCREEN char *s; @@ -1205,7 +1206,19 @@ static void *video_logo (void) logo_plot (video_fb_address, VIDEO_COLS, 0, 0); sprintf (info, " %s", &version_string); - video_drawstring (VIDEO_INFO_X, VIDEO_INFO_Y, (uchar *)info); + + space = (VIDEO_LINE_LEN / 2 - VIDEO_INFO_X) / VIDEO_FONT_WIDTH; + len = strlen(info); + + if (len > space) { + video_drawchars (VIDEO_INFO_X, VIDEO_INFO_Y, + (uchar *)info, space); + video_drawchars (VIDEO_INFO_X + VIDEO_FONT_WIDTH, + VIDEO_INFO_Y + VIDEO_FONT_HEIGHT, + (uchar *)info + space, len - space); + y_off = 1; + } else + video_drawstring (VIDEO_INFO_X, VIDEO_INFO_Y, (uchar *)info); #ifdef CONFIG_CONSOLE_EXTRA_INFO { @@ -1213,10 +1226,27 @@ static void *video_logo (void) for (i = 1; i < n; i++) { video_get_info_str (i, info); - if (*info) + if (!*info) + continue; + + len = strlen(info); + if (len > space) { + video_drawchars (VIDEO_INFO_X, + VIDEO_INFO_Y + + (i + y_off) * VIDEO_FONT_HEIGHT, + (uchar *)info, space); + y_off++; + video_drawchars (VIDEO_INFO_X + VIDEO_FONT_WIDTH, + VIDEO_INFO_Y + + (i + y_off) * VIDEO_FONT_HEIGHT, + (uchar *)info + space, + len - space); + } else { video_drawstring (VIDEO_INFO_X, - VIDEO_INFO_Y + i * VIDEO_FONT_HEIGHT, + VIDEO_INFO_Y + + (i + y_off) * VIDEO_FONT_HEIGHT, (uchar *)info); + } } } #endif -- 1.5.3.3

2 1

[U-Boot] [PATCH] cmd_ide: Remove unused AmigaOneG3SE code
by Peter Tyser 28 Apr '09

28 Apr '09

The output_data_short() and input_data_short() functions for the AmigaOneG3SE are unused and result in compiler warnings. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- common/cmd_ide.c | 44 -------------------------------------------- 1 files changed, 0 insertions(+), 44 deletions(-) diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 9bc6b4a..782ad1c 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -851,28 +851,6 @@ set_pcmcia_timing (int pmode) /* ------------------------------------------------------------------------- */ -#ifdef __PPC__ -# ifdef CONFIG_AMIGAONEG3SE -static void -output_data_short(int dev, ulong *sect_buf, int words) -{ - ushort *dbuf; - volatile ushort *pbuf; - - pbuf = (ushort *)(ATA_CURR_BASE(dev)+ATA_DATA_REG); - dbuf = (ushort *)sect_buf; - while (words--) { - EIEIO; - *pbuf = *dbuf++; - EIEIO; - } - - if (words&1) - *pbuf = 0; -} -# endif /* CONFIG_AMIGAONEG3SE */ -#endif /* __PPC_ */ - /* We only need to swap data if we are running on a big endian cpu. */ /* But Au1x00 cpu:s already swaps data in big endian mode! */ #if defined(__LITTLE_ENDIAN) || ( defined(CONFIG_AU1X00) && !defined(CONFIG_GTH2) ) @@ -1028,28 +1006,6 @@ input_data(int dev, ulong *sect_buf, int words) #endif /* __PPC__ */ -#ifdef CONFIG_AMIGAONEG3SE -static void -input_data_short(int dev, ulong *sect_buf, int words) -{ - ushort *dbuf; - volatile ushort *pbuf; - - pbuf = (ushort *)(ATA_CURR_BASE(dev)+ATA_DATA_REG); - dbuf = (ushort *)sect_buf; - while (words--) { - EIEIO; - *dbuf++ = *pbuf; - EIEIO; - } - - if (words&1) { - ushort dummy; - dummy = *pbuf; - } -} -#endif - /* ------------------------------------------------------------------------- */ static void ide_ident (block_dev_desc_t *dev_desc) -- 1.6.2.1

2 1

[U-Boot] [PATCH] AmigaOneG3SE: Fix CONFIG_CMD_CONSOLE definition
by Peter Tyser 28 Apr '09

28 Apr '09

Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- include/configs/AmigaOneG3SE.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h index b71da1f..fe04f27 100644 --- a/include/configs/AmigaOneG3SE.h +++ b/include/configs/AmigaOneG3SE.h @@ -85,7 +85,7 @@ #define CONFIG_CMD_IDE #define CONFIG_CMD_FDC #define CONFIG_CMD_CACHE -#define CONFIG_CMD_CONSOLE| +#define CONFIG_CMD_CONSOLE #define CONFIG_CMD_USB #define CONFIG_CMD_BSP #define CONFIG_CMD_PCI -- 1.6.2.1

2 1

[U-Boot] [PATCH 2/2] Replace __asm references with __asm__
by Peter Tyser 28 Apr '09

28 Apr '09

__asm__ follows gcc's documented syntax and is generally more common than __asm. This change is only asthetic and should not affect functionality. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- board/MAI/AmigaOneG3SE/enet.c | 16 ++++++++-------- board/MAI/AmigaOneG3SE/flash_new.c | 10 +++++----- board/MAI/AmigaOneG3SE/serial.c | 6 +++--- board/MAI/AmigaOneG3SE/via686.c | 2 +- board/trab/vfd.c | 2 +- cpu/ixp/npe/IxFeatureCtrl.c | 2 +- tools/updater/flash_hw.c | 10 +++++----- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/board/MAI/AmigaOneG3SE/enet.c b/board/MAI/AmigaOneG3SE/enet.c index ac969a9..b9df55c 100644 --- a/board/MAI/AmigaOneG3SE/enet.c +++ b/board/MAI/AmigaOneG3SE/enet.c @@ -297,50 +297,50 @@ static void eth_3com_halt(struct eth_device* dev); static inline int ETH_INL(struct eth_device* dev, u_long addr) { - __asm volatile ("eieio"); + __asm__ volatile ("eieio"); return le32_to_cpu(*(volatile u32 *)io_to_phys(addr + dev->iobase)); } static inline int ETH_INW(struct eth_device* dev, u_long addr) { - __asm volatile ("eieio"); + __asm__ volatile ("eieio"); return le16_to_cpu(*(volatile u16 *)io_to_phys(addr + dev->iobase)); } static inline int ETH_INB(struct eth_device* dev, u_long addr) { - __asm volatile ("eieio"); + __asm__ volatile ("eieio"); return *(volatile u8 *)io_to_phys(addr + dev->iobase); } static inline void ETH_OUTB(struct eth_device* dev, int command, u_long addr) { *(volatile u8 *)io_to_phys(addr + dev->iobase) = command; - __asm volatile ("eieio"); + __asm__ volatile ("eieio"); } static inline void ETH_OUTW(struct eth_device* dev, int command, u_long addr) { *(volatile u16 *)io_to_phys(addr + dev->iobase) = cpu_to_le16(command); - __asm volatile ("eieio"); + __asm__ volatile ("eieio"); } static inline void ETH_OUTL(struct eth_device* dev, int command, u_long addr) { *(volatile u32 *)io_to_phys(addr + dev->iobase) = cpu_to_le32(command); - __asm volatile ("eieio"); + __asm__ volatile ("eieio"); } static inline int ETH_STATUS(struct eth_device* dev) { - __asm volatile ("eieio"); + __asm__ volatile ("eieio"); return le16_to_cpu(*(volatile u16 *)io_to_phys(EL3_STATUS + dev->iobase)); } static inline void ETH_CMD(struct eth_device* dev, int command) { *(volatile u16 *)io_to_phys(EL3_CMD + dev->iobase) = cpu_to_le16(command); - __asm volatile ("eieio"); + __asm__ volatile ("eieio"); } /* Command register is always in the same spot in all the register windows */ diff --git a/board/MAI/AmigaOneG3SE/flash_new.c b/board/MAI/AmigaOneG3SE/flash_new.c index 7b7ea16..9beb048 100644 --- a/board/MAI/AmigaOneG3SE/flash_new.c +++ b/board/MAI/AmigaOneG3SE/flash_new.c @@ -153,14 +153,14 @@ static ulong flash_get_size (ulong addr, flash_info_t *info) /* Write auto select command: read Manufacturer ID */ x[0x0555] = 0xAA; - __asm volatile ("sync\n eieio"); + __asm__ volatile ("sync\n eieio"); x[0x02AA] = 0x55; - __asm volatile ("sync\n eieio"); + __asm__ volatile ("sync\n eieio"); x[0x0555] = 0x90; - __asm volatile ("sync\n eieio"); + __asm__ volatile ("sync\n eieio"); value = x[0]; - __asm volatile ("sync\n eieio"); + __asm__ volatile ("sync\n eieio"); DEBUGF("Manuf. ID @ 0x%08lx: 0x%08x\n", (ulong)addr, value); @@ -186,7 +186,7 @@ static ulong flash_get_size (ulong addr, flash_info_t *info) } value = x[1]; - __asm volatile ("sync\n eieio"); + __asm__ volatile ("sync\n eieio"); DEBUGF("Device ID @ 0x%08lx: 0x%08x\n", addr+1, value); diff --git a/board/MAI/AmigaOneG3SE/serial.c b/board/MAI/AmigaOneG3SE/serial.c index 88039f3..84a913e 100644 --- a/board/MAI/AmigaOneG3SE/serial.c +++ b/board/MAI/AmigaOneG3SE/serial.c @@ -75,17 +75,17 @@ void serial_init (void) /* COM_WRITE_BYTE(LINE_CONTROL, 0x83); */ /* COM_WRITE_BYTE(DIVISOR_LATCH_LSB, (uint8)(clock_divisor & 0xFF)); */ /* COM_WRITE_BYTE(DIVISOR_LATCH_MSB, (uint8)(clock_divisor >> 8)); */ - /* __asm("eieio"); */ + /* __asm__("eieio"); */ /* Set 8-N-1 */ COM_WRITE_BYTE (LINE_CONTROL, 0x03); - __asm ("eieio"); + __asm__ ("eieio"); /* Disable FIFO */ COM_WRITE_BYTE (MODEM_CONTROL, 0x03); COM_WRITE_BYTE (FIFO_CONTROL, 0x07); - __asm ("eieio"); + __asm__ ("eieio"); serial_init_done = 1; } diff --git a/board/MAI/AmigaOneG3SE/via686.c b/board/MAI/AmigaOneG3SE/via686.c index 2427ce5..752a464 100644 --- a/board/MAI/AmigaOneG3SE/via686.c +++ b/board/MAI/AmigaOneG3SE/via686.c @@ -211,7 +211,7 @@ void via_cfgfunc_via686(struct pci_controller *host, pci_dev_t dev, struct pci_c } } -__asm (" .globl via_calibrate_time_base \n" +__asm__ (" .globl via_calibrate_time_base \n" "via_calibrate_time_base: \n" " lis 9, 0xfe00 \n" " li 0, 0x00 \n" diff --git a/board/trab/vfd.c b/board/trab/vfd.c index eb506f3..37d3aa4 100644 --- a/board/trab/vfd.c +++ b/board/trab/vfd.c @@ -369,7 +369,7 @@ int vfd_init_clocks (void) gpio->PCCON = (gpio->PCCON & 0xFFFFFF00); /* configure GPC0...GPC3 as inputs */ /* allow signals to settle */ for (i=0; i<10000; i++) /* udelay isn't working yet at this point! */ - __asm("NOP"); + __asm__("NOP"); vfd_board_id = (~gpio->PCDAT) & 0x000F; /* read GPC0...GPC3 port pins */ VFD_DISABLE; /* activate blank for the vfd */ diff --git a/cpu/ixp/npe/IxFeatureCtrl.c b/cpu/ixp/npe/IxFeatureCtrl.c index e02aabf..2e196a1 100644 --- a/cpu/ixp/npe/IxFeatureCtrl.c +++ b/cpu/ixp/npe/IxFeatureCtrl.c @@ -317,7 +317,7 @@ ixFeatureCtrlProductIdRead () /* Use ARM instruction to move register0 from coprocessor to ARM register */ #ifndef __wince - __asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(pdId) :); + __asm__("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(pdId) :); #else #ifndef IN_KERNEL diff --git a/tools/updater/flash_hw.c b/tools/updater/flash_hw.c index 8af4b45..b5058b3 100644 --- a/tools/updater/flash_hw.c +++ b/tools/updater/flash_hw.c @@ -153,14 +153,14 @@ static ulong flash_get_size (ulong addr, flash_info_t *info) /* Write auto select command: read Manufacturer ID */ x[0x0555] = 0xAA; - __asm volatile ("sync\n eieio"); + __asm__ volatile ("sync\n eieio"); x[0x02AA] = 0x55; - __asm volatile ("sync\n eieio"); + __asm__ volatile ("sync\n eieio"); x[0x0555] = 0x90; - __asm volatile ("sync\n eieio"); + __asm__ volatile ("sync\n eieio"); value = x[0]; - __asm volatile ("sync\n eieio"); + __asm__ volatile ("sync\n eieio"); DEBUGF("Manuf. ID @ 0x%08lx: 0x%08x\n", (ulong)addr, value); @@ -186,7 +186,7 @@ static ulong flash_get_size (ulong addr, flash_info_t *info) } value = x[1]; - __asm volatile ("sync\n eieio"); + __asm__ volatile ("sync\n eieio"); DEBUGF("Device ID @ 0x%08lx: 0x%08x\n", addr+1, value); -- 1.6.2.1

2 1

[U-Boot] [PATCH 1/2] Replace __attribute references with __attribute__
by Peter Tyser 28 Apr '09

28 Apr '09

__attribute__ follows gcc's documented syntax and is generally more common than __attribute. This change is only asthetic and should not affect functionality. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- cpu/arm920t/at91rm9200/ether.c | 5 +++-- cpu/arm920t/s3c24x0/usb_ohci.h | 8 ++++---- cpu/mips/au1x00_usb_ohci.h | 8 ++++---- cpu/mpc5xxx/usb_ohci.h | 8 ++++---- cpu/mpc86xx/cpu.c | 2 +- cpu/ppc4xx/usb_ohci.h | 8 ++++---- drivers/mmc/mmc.c | 4 ++-- drivers/usb/host/ohci.h | 8 ++++---- drivers/usb/musb/musb_core.h | 2 +- include/asm-m68k/types.h | 2 +- include/asm-ppc/types.h | 2 +- include/asm-sparc/types.h | 2 +- net/eth.c | 4 ++-- 13 files changed, 32 insertions(+), 31 deletions(-) diff --git a/cpu/arm920t/at91rm9200/ether.c b/cpu/arm920t/at91rm9200/ether.c index b00b948..d9d33a2 100644 --- a/cpu/arm920t/at91rm9200/ether.c +++ b/cpu/arm920t/at91rm9200/ether.c @@ -53,10 +53,11 @@ typedef struct { #if defined(CONFIG_CMD_NET) /* alignment as per Errata #11 (64 bytes) is insufficient! */ -rbf_t rbfdt[RBF_FRAMEMAX] __attribute((aligned(512))); +rbf_t rbfdt[RBF_FRAMEMAX] __attribute__((aligned(512))); rbf_t *rbfp; -unsigned char rbf_framebuf[RBF_FRAMEMAX][RBF_FRAMELEN] __attribute((aligned(4))); +unsigned char rbf_framebuf[RBF_FRAMEMAX][RBF_FRAMELEN] + __attribute__((aligned(4))); /* structure to interface the PHY */ AT91S_PhyOps PhyOps; diff --git a/cpu/arm920t/s3c24x0/usb_ohci.h b/cpu/arm920t/s3c24x0/usb_ohci.h index 3af5fca..8e093fb 100644 --- a/cpu/arm920t/s3c24x0/usb_ohci.h +++ b/cpu/arm920t/s3c24x0/usb_ohci.h @@ -55,7 +55,7 @@ struct ed { struct usb_device *usb_dev; __u32 unused[3]; -} __attribute((aligned(16))); +} __attribute__((aligned(16))); typedef struct ed ed_t; @@ -112,7 +112,7 @@ struct td { __u32 data; __u32 unused2[2]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); typedef struct td td_t; #define OHCI_ED_SKIP (1 << 14) @@ -130,7 +130,7 @@ struct ohci_hcca { __u16 pad1; /* set to 0 on each frame_no change */ __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; -} __attribute((aligned(256))); +} __attribute__((aligned(256))); /* @@ -172,7 +172,7 @@ struct ohci_regs { __u32 status; __u32 portstatus[MAX_ROOT_PORTS]; } roothub; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); /* OHCI CONTROL AND STATUS REGISTER MASKS */ diff --git a/cpu/mips/au1x00_usb_ohci.h b/cpu/mips/au1x00_usb_ohci.h index 631ef0a..bb9f351 100644 --- a/cpu/mips/au1x00_usb_ohci.h +++ b/cpu/mips/au1x00_usb_ohci.h @@ -56,7 +56,7 @@ struct ed { struct usb_device *usb_dev; __u32 unused[3]; -} __attribute((aligned(16))); +} __attribute__((aligned(16))); typedef struct ed ed_t; @@ -114,7 +114,7 @@ struct td { __u32 data; __u32 unused2[2]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); typedef struct td td_t; #define OHCI_ED_SKIP (1 << 14) @@ -132,7 +132,7 @@ struct ohci_hcca { __u16 pad1; /* set to 0 on each frame_no change */ __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; -} __attribute((aligned(256))); +} __attribute__((aligned(256))); /* @@ -174,7 +174,7 @@ struct ohci_regs { __u32 status; __u32 portstatus[MAX_ROOT_PORTS]; } roothub; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); /* OHCI CONTROL AND STATUS REGISTER MASKS */ diff --git a/cpu/mpc5xxx/usb_ohci.h b/cpu/mpc5xxx/usb_ohci.h index 884f1d5..6eedbdd 100644 --- a/cpu/mpc5xxx/usb_ohci.h +++ b/cpu/mpc5xxx/usb_ohci.h @@ -56,7 +56,7 @@ struct ed { struct usb_device *usb_dev; __u32 unused[3]; -} __attribute((aligned(16))); +} __attribute__((aligned(16))); typedef struct ed ed_t; @@ -113,7 +113,7 @@ struct td { __u32 data; __u32 unused2[2]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); typedef struct td td_t; #define OHCI_ED_SKIP (1 << 14) @@ -136,7 +136,7 @@ struct ohci_hcca { #endif __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; -} __attribute((aligned(256))); +} __attribute__((aligned(256))); /* @@ -178,7 +178,7 @@ struct ohci_regs { __u32 status; __u32 portstatus[MAX_ROOT_PORTS]; } roothub; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); /* OHCI CONTROL AND STATUS REGISTER MASKS */ diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c index c41616d..653a137 100644 --- a/cpu/mpc86xx/cpu.c +++ b/cpu/mpc86xx/cpu.c @@ -40,7 +40,7 @@ __board_reset(void) { /* Do nothing */ } -void board_reset(void) __attribute((weak, alias("__board_reset"))); +void board_reset(void) __attribute__((weak, alias("__board_reset"))); int diff --git a/cpu/ppc4xx/usb_ohci.h b/cpu/ppc4xx/usb_ohci.h index 706e05e..2c3dc4f 100644 --- a/cpu/ppc4xx/usb_ohci.h +++ b/cpu/ppc4xx/usb_ohci.h @@ -55,7 +55,7 @@ struct ed { struct usb_device *usb_dev; __u32 unused[3]; -} __attribute((aligned(16))); +} __attribute__((aligned(16))); typedef struct ed ed_t; /* TD info field */ @@ -111,7 +111,7 @@ struct td { __u32 data; __u32 unused2[2]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); typedef struct td td_t; #define OHCI_ED_SKIP (1 << 14) @@ -134,7 +134,7 @@ struct ohci_hcca { #endif __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; -} __attribute((aligned(256))); +} __attribute__((aligned(256))); /* * Maximum number of root hub ports. @@ -175,7 +175,7 @@ struct ohci_regs { __u32 status; __u32 portstatus[MAX_ROOT_PORTS]; } roothub; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); /* OHCI CONTROL AND STATUS REGISTER MASKS */ diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 96186d9..7791c38 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -896,8 +896,8 @@ static int __def_mmc_init(bd_t *bis) return -1; } -int cpu_mmc_init(bd_t *bis) __attribute((weak, alias("__def_mmc_init"))); -int board_mmc_init(bd_t *bis) __attribute((weak, alias("__def_mmc_init"))); +int cpu_mmc_init(bd_t *bis) __attribute__((weak, alias("__def_mmc_init"))); +int board_mmc_init(bd_t *bis) __attribute__((weak, alias("__def_mmc_init"))); void print_mmc_devices(char separator) { diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index a547337..79aa79d 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -101,7 +101,7 @@ struct ed { struct usb_device *usb_dev; void *purb; __u32 unused[2]; -} __attribute((aligned(16))); +} __attribute__((aligned(16))); typedef struct ed ed_t; @@ -161,7 +161,7 @@ struct td { __u32 data; __u32 unused2[2]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); typedef struct td td_t; #define OHCI_ED_SKIP (1 << 14) @@ -184,7 +184,7 @@ struct ohci_hcca { #endif __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; -} __attribute((aligned(256))); +} __attribute__((aligned(256))); /* @@ -228,7 +228,7 @@ struct ohci_regs { __u32 status; __u32 portstatus[CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS]; } roothub; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); /* Some EHCI controls */ #define EHCI_USBCMD_OFF 0x20 diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 2597c5f..b81c536 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -97,7 +97,7 @@ struct musb_regs { u8 rxhubaddr; u8 rxhubport; } tar[16]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); /* * MUSB Register bits diff --git a/include/asm-m68k/types.h b/include/asm-m68k/types.h index 44b4ca5..3ffcab2 100644 --- a/include/asm-m68k/types.h +++ b/include/asm-m68k/types.h @@ -21,7 +21,7 @@ __extension__ typedef unsigned long long __u64; typedef struct { __u32 u[4]; -} __attribute((aligned(16))) vector128; +} __attribute__((aligned(16))) vector128; #ifdef __KERNEL__ /* diff --git a/include/asm-ppc/types.h b/include/asm-ppc/types.h index 864391f..b27a6b7 100644 --- a/include/asm-ppc/types.h +++ b/include/asm-ppc/types.h @@ -21,7 +21,7 @@ __extension__ typedef unsigned long long __u64; typedef struct { __u32 u[4]; -} __attribute((aligned(16))) vector128; +} __attribute__((aligned(16))) vector128; #ifdef __KERNEL__ /* diff --git a/include/asm-sparc/types.h b/include/asm-sparc/types.h index 2cf974a..0a8a26c 100644 --- a/include/asm-sparc/types.h +++ b/include/asm-sparc/types.h @@ -42,7 +42,7 @@ typedef unsigned long long __u64; typedef struct { __u32 u[4]; -} __attribute((aligned(16))) vector128; +} __attribute__((aligned(16))) vector128; #ifdef __KERNEL__ /* diff --git a/net/eth.c b/net/eth.c index 4bbf84b..c6fa5b9 100644 --- a/net/eth.c +++ b/net/eth.c @@ -68,8 +68,8 @@ static int __def_eth_init(bd_t *bis) { return -1; } -int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init"))); -int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init"))); +int cpu_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init"))); +int board_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init"))); extern int mv6436x_eth_initialize(bd_t *); extern int mv6446x_eth_initialize(bd_t *); -- 1.6.2.1

2 1

[U-Boot] [PATCH] s3c64xx: remove unnecessary definition
by Minkyu Kang 28 Apr '09

28 Apr '09

CONFIG_S3C6400 is must defined at config header file That definition is unnecessary at this file Signed-off-by: Minkyu Kang <mk7.kang(a)samsung.com> --- include/s3c6400.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/include/s3c6400.h b/include/s3c6400.h index 87f3760..e527c08 100644 --- a/include/s3c6400.h +++ b/include/s3c6400.h @@ -31,10 +31,6 @@ #ifndef __S3C6400_H__ #define __S3C6400_H__ -#ifndef CONFIG_S3C6400 -#define CONFIG_S3C6400 1 -#endif - #define S3C64XX_UART_CHANNELS 3 #define S3C64XX_SPI_CHANNELS 2

3 2