June 2011 - U-Boot

[U-Boot] [PATCH 00/10] updates for common keymile code
by Holger Brunck 27 Jul '11

27 Jul '11

This is mainly an cleanup for the keymile boards. The second step of simplifying the default and debug environment for all boards is the main change in this set. Addititionaly some dead code, unsused defines were removed and the ivm code was reorganized to an own ivmc.c file. The km82xx specific code war moved from common.c to km_82xx.c. CRAMFS and CRAMFS_CMDLINE was enabled for all boards. All keymile boards compile cleanly and checkpatch reports no errors or warnings. Holger Brunck (9): km/common: rework and simplify default environment km/common: simplify debug environment km/common: remove obsolete defines and header km/common: force set ethaddr after reading IVM km/common: remove saveenv from do_checkboardidhwkey km/common: move ivm functions from to ivm.c km/common: remove fdt_(gs)et_node_and_value powerpc/km82xx: remove 82xx specific functions from common.c km/common: enable cramfs and cramfs cmdline Thomas Herzmann (1): km/common: add test sw starting variable board/keymile/common/common.c | 456 +--------------------------- board/keymile/common/common.h | 2 +- board/keymile/common/ivm.c | 342 +++++++++++++++++++++ board/keymile/common/keymile_hdlc_enet.h | 129 -------- board/keymile/km82xx/Makefile | 2 +- board/keymile/km82xx/km82xx.c | 60 ++++ board/keymile/km83xx/Makefile | 2 +- board/keymile/km_arm/Makefile | 2 +- board/keymile/scripts/README | 42 ++- board/keymile/scripts/debug-arm-env.txt | 2 - board/keymile/scripts/debug-common-env.txt | 9 - board/keymile/scripts/debug-ppc-env.txt | 2 - board/keymile/scripts/develop-arm.txt | 2 + board/keymile/scripts/develop-common.txt | 6 + board/keymile/scripts/develop-ppc_82xx.txt | 2 + board/keymile/scripts/develop-ppc_8xx.txt | 2 + board/keymile/scripts/ramfs-arm.txt | 2 + board/keymile/scripts/ramfs-common.txt | 12 + board/keymile/scripts/ramfs-ppc_82xx.txt | 2 + board/keymile/scripts/ramfs-ppc_8xx.txt | 2 + include/configs/km/keymile-common.h | 131 +++------ include/configs/km/km-powerpc.h | 12 +- include/configs/km/km82xx-common.h | 9 +- include/configs/km/km8321-common.h | 3 +- include/configs/km/km83xx-common.h | 7 +- include/configs/km/km_arm.h | 16 +- 26 files changed, 529 insertions(+), 729 deletions(-) create mode 100644 board/keymile/common/ivm.c delete mode 100644 board/keymile/common/keymile_hdlc_enet.h delete mode 100644 board/keymile/scripts/debug-arm-env.txt delete mode 100644 board/keymile/scripts/debug-common-env.txt delete mode 100644 board/keymile/scripts/debug-ppc-env.txt create mode 100644 board/keymile/scripts/develop-arm.txt create mode 100644 board/keymile/scripts/develop-common.txt create mode 100644 board/keymile/scripts/develop-ppc_82xx.txt create mode 100644 board/keymile/scripts/develop-ppc_8xx.txt create mode 100644 board/keymile/scripts/ramfs-arm.txt create mode 100644 board/keymile/scripts/ramfs-common.txt create mode 100644 board/keymile/scripts/ramfs-ppc_82xx.txt create mode 100644 board/keymile/scripts/ramfs-ppc_8xx.txt

2 22

[U-Boot] [PATCH] part_dos: fix crash with big sector size
by Sergei Shtylyov 27 Jul '11

27 Jul '11

Apple iPod nanos have sector sizes of 2 or 4 KiB, which crashes U-Boot when it tries to read the MBR into 512-byte buffer situated on stack. Instead use the variable length arrays to be safe with any large sector size. Signed-off-by: Sergei Shtylyov <sshtylyov(a)ru.mvista.com> --- The same change is probably needed for disk/part_amiga.c but I'm not really sure if Amiga supports USB... :-) disk/part_dos.c | 6 +++--- disk/part_dos.h | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) Index: u-boot/disk/part_dos.c =================================================================== --- u-boot.orig/disk/part_dos.c +++ u-boot/disk/part_dos.c @@ -87,7 +87,7 @@ static int test_block_type(unsigned char int test_part_dos (block_dev_desc_t *dev_desc) { - unsigned char buffer[DEFAULT_SECTOR_SIZE]; + unsigned char buffer[dev_desc->blksz]; if ((dev_desc->block_read(dev_desc->dev, 0, 1, (ulong *) buffer) != 1) || (buffer[DOS_PART_MAGIC_OFFSET + 0] != 0x55) || @@ -102,7 +102,7 @@ int test_part_dos (block_dev_desc_t *dev static void print_partition_extended (block_dev_desc_t *dev_desc, int ext_part_sector, int relative, int part_num) { - unsigned char buffer[DEFAULT_SECTOR_SIZE]; + unsigned char buffer[dev_desc->blksz]; dos_partition_t *pt; int i; @@ -166,7 +166,7 @@ static int get_partition_info_extended ( int relative, int part_num, int which_part, disk_partition_t *info) { - unsigned char buffer[DEFAULT_SECTOR_SIZE]; + unsigned char buffer[dev_desc->blksz]; dos_partition_t *pt; int i; Index: u-boot/disk/part_dos.h =================================================================== --- u-boot.orig/disk/part_dos.h +++ u-boot/disk/part_dos.h @@ -25,13 +25,6 @@ #define _DISK_PART_DOS_H -#ifdef CONFIG_ISO_PARTITION -/* Make the buffers bigger if ISO partition support is enabled -- CD-ROMS - have 2048 byte blocks */ -#define DEFAULT_SECTOR_SIZE 2048 -#else -#define DEFAULT_SECTOR_SIZE 512 -#endif #define DOS_PART_TBL_OFFSET 0x1be #define DOS_PART_MAGIC_OFFSET 0x1fe #define DOS_PBR_FSTYPE_OFFSET 0x36

3 3

[U-Boot] [PATCH v2] post, memorytest: add support for none powerpc archs
by Heiko Schocher 27 Jul '11

27 Jul '11

change bd->bi_memsize to gd->ram_size, as this is defined on all archs, so this post test can used on none powerpc archs too. Signed-off-by: Heiko Schocher <hs(a)denx.de> cc: Wolfgang Denk <hs(a)denx.de> cc: Mike Frysinger <vapier(a)gentoo.org> --- changes for v2: added comment from Wolfgang Denk: - add comment, that this function is only valid for contiguous memory banks. added comment from Mike Frysinger: - use gd->ram_size instead of bd->bi_memsize -> no ifdef needed. post/drivers/memory.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/post/drivers/memory.c b/post/drivers/memory.c index b7943ef..b286e3f 100644 --- a/post/drivers/memory.c +++ b/post/drivers/memory.c @@ -452,13 +452,17 @@ static int memory_post_tests (unsigned long start, unsigned long size) return ret; } +/* + * !! this is only valid, if you have contiguous memory banks !! + */ __attribute__((weak)) int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset) { bd_t *bd = gd->bd; + *vstart = CONFIG_SYS_SDRAM_BASE; - *size = (bd->bi_memsize >= 256 << 20 ? - 256 << 20 : bd->bi_memsize) - (1 << 20); + *size = (gd->ram_size >= 256 << 20 ? + 256 << 20 : gd->ram_size) - (1 << 20); /* Limit area to be tested with the board info struct */ if ((*vstart) + (*size) > (ulong)bd) -- 1.7.4.4

2 1

[U-Boot] [PATCH v2] net: Add SMSC89128 support
by Phil Edworthy 27 Jul '11

27 Jul '11

Signed-off-by: Phil Edworthy <phil.edworthy(a)renesas.com> Cc: Ben Warren <biggerbadderben(a)gmail.com> --- Changes for v2: - Changed to keep list sorted drivers/net/smc911x.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 05e007c..8ce08a9 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h @@ -384,6 +384,7 @@ static inline void smc911x_reg_write(struct eth_device *dev, #define WUCSR_MPEN 0x00000002 /* Chip ID values */ +#define CHIP_89218 0x218a #define CHIP_9115 0x115 #define CHIP_9116 0x116 #define CHIP_9117 0x117 @@ -402,6 +403,7 @@ struct chip_id { }; static const struct chip_id chip_ids[] = { + { CHIP_89218, "LAN89218" }, { CHIP_9115, "LAN9115" }, { CHIP_9116, "LAN9116" }, { CHIP_9117, "LAN9117" }, -- 1.7.0.4

2 1

[U-Boot] [PATCH] phylib: Detect link on 10G devices correctly
by Andy Fleming 27 Jul '11

27 Jul '11

gen10g_startup() had 2 bugs: 1) It had a boolean logic error in checking the MMD mask, and always checked all of them. 2) It checked devices which don't actually report link state, which meant that it would never believe the link was fully up. Fix the boolean logic, and then mask the MMD mask so only link-reporting devices are checked. Signed-off-by: Andy Fleming <afleming(a)freescale.com> Reported-by: Ed Swarthout <Ed.Swarthout(a)freescale.com> --- drivers/net/phy/generic_10g.c | 8 ++++++-- include/linux/mdio.h | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c index 315c508..1c3e69e 100644 --- a/drivers/net/phy/generic_10g.c +++ b/drivers/net/phy/generic_10g.c @@ -36,7 +36,7 @@ int gen10g_shutdown(struct phy_device *phydev) int gen10g_startup(struct phy_device *phydev) { int devad, reg; - u32 mmd_mask = phydev->mmds; + u32 mmd_mask = phydev->mmds & MDIO_DEVS_LINK; phydev->link = 1; @@ -44,8 +44,12 @@ int gen10g_startup(struct phy_device *phydev) phydev->speed = SPEED_10000; phydev->duplex = DUPLEX_FULL; + /* + * Go through all the link-reporting devices, and make sure + * they're all up and happy + */ for (devad = 0; mmd_mask; devad++, mmd_mask = mmd_mask >> 1) { - if (!mmd_mask & 1) + if (!(mmd_mask & 1)) continue; /* Read twice because link state is latched and a diff --git a/include/linux/mdio.h b/include/linux/mdio.h index 022d772..f2080dd 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -120,6 +120,14 @@ #define MDIO_DEVS_VEND1 MDIO_DEVS_PRESENT(MDIO_MMD_VEND1) #define MDIO_DEVS_VEND2 MDIO_DEVS_PRESENT(MDIO_MMD_VEND2) +#define MDIO_DEVS_LINK (MDIO_DEVS_PMAPMD | \ + MDIO_DEVS_WIS | \ + MDIO_DEVS_PCS | \ + MDIO_DEVS_PHYXS | \ + MDIO_DEVS_DTEXS | \ + MDIO_DEVS_AN) + + /* Control register 2. */ #define MDIO_PMA_CTRL2_TYPE 0x000f /* PMA/PMD type selection */ -- 1.6.5.2.g6ff9a

3 2

[U-Boot] [PATCH 1/3] rtc: add driver for internal RTC on kirkwood SoC
by Chris Packham 27 Jul '11

27 Jul '11

From: Luuk Paulussen <luuk.paulussen(a)alliedtelesis.co.nz> Signed-off-by: Luuk Paulussen <luuk.paulussen(a)alliedtelesis.co.nz> Acked-by: Chris Packham <chris.packham(a)alliedtelesis.co.nz> Cc: Prafulla Wadaskar <prafulla(a)marvell.com> --- arch/arm/include/asm/arch-kirkwood/kirkwood.h | 2 + drivers/rtc/Makefile | 1 + drivers/rtc/kirkwood.c | 76 +++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 0 deletions(-) create mode 100644 drivers/rtc/kirkwood.c diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h index 0104418..15922eb 100644 --- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h +++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h @@ -50,6 +50,8 @@ #define KW_MPP_BASE (KW_REGISTER(0x10000)) #define KW_GPIO0_BASE (KW_REGISTER(0x10100)) #define KW_GPIO1_BASE (KW_REGISTER(0x10140)) +#define KW_RTC_TIME (KW_REGISTER(0x10300)) +#define KW_RTC_DATE (KW_REGISTER(0x10304)) #define KW_NANDF_BASE (KW_REGISTER(0x10418)) #define KW_SPI_BASE (KW_REGISTER(0x10600)) #define KW_CPU_WIN_BASE (KW_REGISTER(0x20000)) diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index e4be4a4..ec064d9 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -43,6 +43,7 @@ COBJS-$(CONFIG_RTC_DS174x) += ds174x.o COBJS-$(CONFIG_RTC_DS3231) += ds3231.o COBJS-$(CONFIG_RTC_FTRTC010) += ftrtc010.o COBJS-$(CONFIG_RTC_ISL1208) += isl1208.o +COBJS-$(CONFIG_RTC_KIRKWOOD) += kirkwood.o COBJS-$(CONFIG_RTC_M41T11) += m41t11.o COBJS-$(CONFIG_RTC_M41T60) += m41t60.o COBJS-$(CONFIG_RTC_M41T62) += m41t62.o diff --git a/drivers/rtc/kirkwood.c b/drivers/rtc/kirkwood.c new file mode 100644 index 0000000..5c9bc81 --- /dev/null +++ b/drivers/rtc/kirkwood.c @@ -0,0 +1,76 @@ +/* + * Driver for the RTC in Marvell SoCs. + * + * Based on Linux Kernel driver. + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include <common.h> +#include <command.h> +#include <rtc.h> +#include <bcd.h> +#include <asm/arch/kirkwood.h> + +#if defined(CONFIG_CMD_DATE) + +#define RTC_TIME_REG_OFFS 0 +#define RTC_SECONDS_OFFS 0 +#define RTC_MINUTES_OFFS 8 +#define RTC_HOURS_OFFS 16 +#define RTC_WDAY_OFFS 24 +#define RTC_HOURS_12H_MODE (1 << 22) /* 12 hours mode */ + +#define RTC_DATE_REG_OFFS 4 +#define RTC_MDAY_OFFS 0 +#define RTC_MONTH_OFFS 8 +#define RTC_YEAR_OFFS 16 +#define KIRKWOOD_YEAR_BASE 2000 + +int rtc_set(struct rtc_time *tmp) +{ + ulong rtc_reg; + + GregorianDay (tmp); + + rtc_reg = (bin2bcd(tmp->tm_sec) << RTC_SECONDS_OFFS) | + (bin2bcd(tmp->tm_min) << RTC_MINUTES_OFFS) | + (bin2bcd(tmp->tm_hour) << RTC_HOURS_OFFS) | + (bin2bcd(tmp->tm_wday) << RTC_WDAY_OFFS); + writel(rtc_reg, KW_RTC_TIME); + + rtc_reg = (bin2bcd(tmp->tm_mday) << RTC_MDAY_OFFS) | + (bin2bcd(tmp->tm_mon + 1) << RTC_MONTH_OFFS) | + (bin2bcd(tmp->tm_year - KIRKWOOD_YEAR_BASE) << RTC_YEAR_OFFS); + writel(rtc_reg, KW_RTC_DATE); + + return 0; +} + +int rtc_get(struct rtc_time *tmp) +{ + ulong rtc_time, rtc_date; + + rtc_time = readl(KW_RTC_TIME); + rtc_date = readl(KW_RTC_DATE); + + tmp->tm_sec = bcd2bin(rtc_time & 0x7f); + tmp->tm_min = bcd2bin((rtc_time >> RTC_MINUTES_OFFS) & 0x7f); + tmp->tm_hour = bcd2bin((rtc_time >> RTC_HOURS_OFFS) & 0x3f); /* assume 24 hours mode */ + tmp->tm_mday = bcd2bin(rtc_date & 0x3f); + tmp->tm_wday = bcd2bin((rtc_time >> RTC_WDAY_OFFS) & 0x7); + tmp->tm_mon = bcd2bin((rtc_date >> RTC_MONTH_OFFS) & 0x3f) - 1; + /* hw counts from year 2000, but tm_year is relative to 0 */ + tmp->tm_year = bcd2bin((rtc_date >> RTC_YEAR_OFFS) & 0xff) + KIRKWOOD_YEAR_BASE; + + return 0; +} + +void rtc_reset(void) +{ + return; +} + +#endif /* CONFIG_CMD_DATE */ -- 1.7.4.1

4 13

[U-Boot] [PATCH] sh_eth.c: EDMAC descriptor leak
by Yoshinori Sato 27 Jul '11

27 Jul '11

Hi, I found memory leak in sh_eth.c. sh_eth_desc_init call for many times in network problem. And it every time allocate new descriptor. So leak old descriptor. I will fix this patch. diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 17dd0d2..f805785 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -313,6 +313,9 @@ static int sh_eth_tx_desc_init(struct sh_eth_dev *eth) struct sh_eth_info *port_info = &eth->port_info[port]; struct tx_desc_s *cur_tx_desc; + if (port_info->tx_desc_malloc) + /* Already allocated. re-using it */ + return 0; /* * Allocate tx descriptors. They must be TX_DESC_SIZE bytes aligned */ @@ -365,6 +368,9 @@ static int sh_eth_rx_desc_init(struct sh_eth_dev *eth) u32 tmp_addr; u8 *rx_buf; + if (port_info->rx_desc_malloc) + /* Already allocated. re-using it */ + return 0; /* * Allocate rx descriptors. They must be RX_DESC_SIZE bytes aligned */ -- Yoshinori Sato <ysato(a)users.sourceforge.jp>

2 1

[U-Boot] [PATCH 1/2] powerpc/85xx: Update timer-frequency prop in ptp_timer node of device tree
by Kumar Gala 27 Jul '11

27 Jul '11

From: bhaskar upadhaya <Bhaskar.Upadhaya(a)freescale.com> Fix up the device tree property associated with the IEEE 1588 timer source frequency. Currently we only support the IEEE 1588 timer source being the internal eTSEC system clock (for those SoCs with IEEE 1588 support). The eTSEC clock is ccb_clk/2. Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya(a)freescale.com> Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- arch/powerpc/cpu/mpc85xx/fdt.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 6ed0284..642f6c5 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -486,4 +486,13 @@ void ft_cpu_setup(void *blob, bd_t *bd) #ifdef CONFIG_SYS_SRIO ft_srio_setup(blob); #endif + + /* + * system-clock = CCB clock/2 + * Here gd->bus_clk = CCB clock + * We are using the system clock as 1588 Timer reference + * clock source select + */ + do_fixup_by_compat_u32(blob, "fsl,gianfar-ptp-timer", + "timer-frequency", gd->bus_clk/2, 1); } -- 1.7.2.3

1 2

[U-Boot] [PATCH v3 0/3] Support for PXE options in DHCP requests
by Jason Hobbs 26 Jul '11

26 Jul '11

This patch series adds support for RFC 4578 compliant DHCP request options, which enhance the ability of DHCP servers to respond differently to different clients. As an example, the last patch in this series enables support for the PXE DHCP options for the ca9x4_ct_vxp config. changes in v2: - drop uuid.h in favor of common.h - alphabetical order for build targets changes in v3: - add checks for NULL pointers in uuid conversion function Jason Hobbs (3): lib: add uuid_str_to_bin for use with bootp and PXE uuid net: bootp: add PXE/RFC 4578 DHCP options support arm: ca9x4_ct_vxp: enable CONFIG_BOOTP_PXE include/common.h | 3 ++ include/configs/ca9x4_ct_vxp.h | 5 ++++ lib/Makefile | 1 + lib/uuid.c | 53 ++++++++++++++++++++++++++++++++++++++++ net/bootp.c | 36 +++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 0 deletions(-) create mode 100644 lib/uuid.c

2 6

[U-Boot] [PATCH 0/2] update from FIT image: add optional address, new command fitupd
by Andreas Pretzsch 26 Jul '11

26 Jul '11

Create new command "fitupd", so an update from a FIT-image can also be triggered from U-Boot shell, in addition to the automatic update after bootup when 'updatefile' is set. Also provide a way to use a FIT image in memory (e.g. loaded from MMC) instead of always load from a TFTP server. See doc/README.update for more information. Adhere to present coding style => checkpatch warnings discarded. Andreas Pretzsch (2): automatic update from FIT image: add optional address parameter add command fitupd to run an update from a FIT image common/Makefile | 1 + common/cmd_fitupd.c | 37 +++++++++++++++++++++++++++++++++++++ common/main.c | 4 ++-- common/update.c | 8 ++++++-- doc/README.update | 5 +++++ 5 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 common/cmd_fitupd.c -- 1.7.4.1

2 7