September 2012 - U-Boot

[U-Boot] [PATCH 0/9] Auto partition selection and fs partition consolidation
by Rob Herring 26 Sep '12

26 Sep '12

From: Rob Herring <rob.herring(a)calxeda.com> The primary goal of this series is to enable auto selection of a partition using the 1st bootable partition as the default partition for disk based boot commands. If a bootable partition is not found and partition is not specified, then the first valid partition is used. Every command that takes a "<dev>[:<part>]" option duplicates the same parsing code, so this series consolidates the parsing code to a single function and converts all block based filesystem code over to use th This is based on Wolfgang's ext4 branch. Rob Rob Herring (9): combine block device load commands into common function disk/part: check bootable flag for DOS partitions disk/part: introduce get_device_and_partition ext4: remove init_fs/deinit_fs cmd_extX: use common get_device_and_partition function cmd_fat: use common get_device_and_partition function cmd_disk: use common get_device_and_partition function cmd_zfs: use common get_device_and_partition function cmd_reiser: use common get_device_and_partition function common/Makefile | 1 + common/cmd_disk.c | 122 ++++++++++++++++++++++++++++++++++++++ common/cmd_ext4.c | 106 +++------------------------------ common/cmd_ext_common.c | 108 ++++++++------------------------- common/cmd_fat.c | 100 +++++++++++-------------------- common/cmd_ide.c | 151 +---------------------------------------------- common/cmd_reiser.c | 81 ++++++------------------- common/cmd_scsi.c | 123 +------------------------------------- common/cmd_usb.c | 138 +------------------------------------------ common/cmd_zfs.c | 88 ++++++--------------------- disk/part.c | 90 +++++++++++++++++++++++++++- disk/part_dos.c | 11 +++- fs/ext4/dev.c | 32 ++++------ fs/ext4/ext4_common.h | 1 - fs/ext4/ext4fs.c | 37 +----------- fs/reiserfs/dev.c | 29 ++++----- fs/zfs/dev.c | 35 ++++------- include/command.h | 4 ++ include/ext4fs.h | 5 +- include/ext_common.h | 2 + include/part.h | 14 ++++- include/reiserfs.h | 2 +- include/zfs_common.h | 7 +-- 23 files changed, 380 insertions(+), 907 deletions(-) create mode 100644 common/cmd_disk.c -- 1.7.9.5

3 19

[U-Boot] [PATCH V4 1/6] disk: introduce get_device()
by Stephen Warren 26 Sep '12

26 Sep '12

From: Stephen Warren <swarren(a)nvidia.com> This patch introduces function get_device(). This looks up a block_dev_desc_t from an interface name (e.g. mmc) and device number (e.g. 0). This function is essentially the non-partition-specific prefix of get_device_and_partition(). Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v4: Rebased. v3: New patch. The series is based on a merge of (slightly old versions of) u-boot-tegra/master, u-boot-usb/master, and u-boot/ext4, and (the latest version of) Rob's load command rework series, although only u-boot/ext4 and Rob's patches are likely to contribute any context to the diffs here; my usage of the other branches was just a convenience for testing. --- disk/part.c | 22 ++++++++++++++++++++++ include/part.h | 5 +++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/disk/part.c b/disk/part.c index 958656c..0a1b9cb 100644 --- a/disk/part.c +++ b/disk/part.c @@ -435,6 +435,28 @@ void print_part (block_dev_desc_t * dev_desc) #endif +int get_device(const char *ifname, const char *dev_str, + block_dev_desc_t **dev_desc) +{ + char *ep; + int dev; + + dev = simple_strtoul(dev_str, &ep, 16); + if (*ep) { + printf("** Bad device specification %s %s **\n", + ifname, dev_str); + return -1; + } + + *dev_desc = get_dev(ifname, dev); + if (!(*dev_desc) || ((*dev_desc)->type == DEV_TYPE_UNKNOWN)) { + printf("** Bad device %s %s **\n", ifname, dev_str); + return -1; + } + + return dev; +} + int get_device_and_partition(const char *ifname, const char *dev_str, block_dev_desc_t **dev_desc, disk_partition_t *info) diff --git a/include/part.h b/include/part.h index a6d06f3..144df4e 100644 --- a/include/part.h +++ b/include/part.h @@ -112,6 +112,8 @@ int get_partition_info (block_dev_desc_t * dev_desc, int part, disk_partition_t void print_part (block_dev_desc_t *dev_desc); void init_part (block_dev_desc_t *dev_desc); void dev_print(block_dev_desc_t *dev_desc); +int get_device(const char *ifname, const char *dev_str, + block_dev_desc_t **dev_desc); int get_device_and_partition(const char *ifname, const char *dev_str, block_dev_desc_t **dev_desc, disk_partition_t *info); @@ -131,6 +133,9 @@ static inline int get_partition_info (block_dev_desc_t * dev_desc, int part, static inline void print_part (block_dev_desc_t *dev_desc) {} static inline void init_part (block_dev_desc_t *dev_desc) {} static inline void dev_print(block_dev_desc_t *dev_desc) {} +static inline int get_device(const char *ifname, const char *dev_str, + block_dev_desc_t **dev_desc) +{ return -1; } static inline int get_device_and_partition(const char *ifname, const char *dev_str, block_dev_desc_t **dev_desc, -- 1.7.0.4

2 6

[U-Boot] [PATCH V2] disk: make get_partition_info() always available to disk.c
by Stephen Warren 26 Sep '12

26 Sep '12

From: Stephen Warren <swarren(a)nvidia.com> Now that get_device_and_partition() always calls get_partition_info() when disk.c is compiled, we must always compile the function, rather than ifdef it away. The implementation must be conditional based on CONFIG_CMD_* etc., since that's what e.g. part_dos.c uses to ifdef out get_partition_info_dos(); CONFIG_DOS_PARTITION can be enabled even without those commands being enabled. Technically, this change is required before Rob's "disk/part: introduce get_device_and_partition" patch. However, at least when the compiler optimizer is turned on, it isn't required before then in practice, since get_device_and_partition() calls get_dev(), which is stubbed out in disk.c under exactly the same conditions that get_partition_info() is not compiled, and hence the compiler never generates code for the call to the missing function. However, in my later patch "disk: get_device_and_partition() "auto" partition and cleanup", the optimizer doesn't succeed at this, and may attempt to reference the undefined function. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: Add CONFIG_CMD_* etc. ifdefs around the implementation. Rob, I wonder if you shouldn't squash this into your series. Then, I'll need to rebase mine on your again since this causes a few nasty conflicts with my series. --- disk/part.c | 118 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 63 insertions(+), 55 deletions(-) diff --git a/disk/part.c b/disk/part.c index 76f3939..f659cc3 100644 --- a/disk/part.c +++ b/disk/part.c @@ -291,61 +291,6 @@ void init_part (block_dev_desc_t * dev_desc) } -int get_partition_info (block_dev_desc_t *dev_desc, int part - , disk_partition_t *info) -{ - switch (dev_desc->part_type) { -#ifdef CONFIG_MAC_PARTITION - case PART_TYPE_MAC: - if (get_partition_info_mac(dev_desc,part,info) == 0) { - PRINTF ("## Valid MAC partition found ##\n"); - return (0); - } - break; -#endif - -#ifdef CONFIG_DOS_PARTITION - case PART_TYPE_DOS: - if (get_partition_info_dos(dev_desc,part,info) == 0) { - PRINTF ("## Valid DOS partition found ##\n"); - return (0); - } - break; -#endif - -#ifdef CONFIG_ISO_PARTITION - case PART_TYPE_ISO: - if (get_partition_info_iso(dev_desc,part,info) == 0) { - PRINTF ("## Valid ISO boot partition found ##\n"); - return (0); - } - break; -#endif - -#ifdef CONFIG_AMIGA_PARTITION - case PART_TYPE_AMIGA: - if (get_partition_info_amiga(dev_desc, part, info) == 0) - { - PRINTF ("## Valid Amiga partition found ##\n"); - return (0); - } - break; -#endif - -#ifdef CONFIG_EFI_PARTITION - case PART_TYPE_EFI: - if (get_partition_info_efi(dev_desc,part,info) == 0) { - PRINTF ("## Valid EFI partition found ##\n"); - return (0); - } - break; -#endif - default: - break; - } - return (-1); -} - static void print_part_header (const char *type, block_dev_desc_t * dev_desc) { puts ("\nPartition Map for "); @@ -433,3 +378,66 @@ void print_part (block_dev_desc_t * dev_desc) #endif #endif + +int get_partition_info(block_dev_desc_t *dev_desc, int part + , disk_partition_t *info) +{ +#if defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SATA) || \ + defined(CONFIG_CMD_SCSI) || \ + defined(CONFIG_CMD_USB) || \ + defined(CONFIG_MMC) || \ + defined(CONFIG_SYSTEMACE) + + switch (dev_desc->part_type) { +#ifdef CONFIG_MAC_PARTITION + case PART_TYPE_MAC: + if (get_partition_info_mac(dev_desc, part, info) == 0) { + PRINTF("## Valid MAC partition found ##\n"); + return 0; + } + break; +#endif + +#ifdef CONFIG_DOS_PARTITION + case PART_TYPE_DOS: + if (get_partition_info_dos(dev_desc, part, info) == 0) { + PRINTF("## Valid DOS partition found ##\n"); + return 0; + } + break; +#endif + +#ifdef CONFIG_ISO_PARTITION + case PART_TYPE_ISO: + if (get_partition_info_iso(dev_desc, part, info) == 0) { + PRINTF("## Valid ISO boot partition found ##\n"); + return 0; + } + break; +#endif + +#ifdef CONFIG_AMIGA_PARTITION + case PART_TYPE_AMIGA: + if (get_partition_info_amiga(dev_desc, part, info) == 0) { + PRINTF("## Valid Amiga partition found ##\n"); + return 0; + } + break; +#endif + +#ifdef CONFIG_EFI_PARTITION + case PART_TYPE_EFI: + if (get_partition_info_efi(dev_desc, part, info) == 0) { + PRINTF("## Valid EFI partition found ##\n"); + return 0; + } + break; +#endif + default: + break; + } +#endif + + return -1; +} -- 1.7.0.4

2 3

[U-Boot] [PATCH 0/4] USB multi controller
by Lucas Stach 26 Sep '12

26 Sep '12

V5: rebased on a non-stale version of u-boot-usb/master V4: Fixed build failures in fsl and mxs ehci code. Also rebased on the latest usb/master and did MAKEALL -a powerpc in addition to MAKEALL -a arm. V3: Stephen ran into some problems applying this, as it seems my tree wasn't as clean as it should have been. Sorry for the inconvenience. This should now be fixed. Hi all, this is a follow up on the patch "USB: EHCI: Initialize multiple USB controllers at once" from Jim Lin. It takes some of the code but has undergone some heavy reworking. When we remove the ifdef horror from the above mentioned patch it's mostly a big interface change to the usb subsystem. As this creates a lot of churn I've split this up into a series. Every patch is self contained so it doesn't break compiles and *should* not regress any functionality on it's own. At least the series is bisectable in case anything goes wrong. I've compile tested all the ARM configs. Both the lowlevel usb and ehci interface change are backward compatible, so implementations that only use one controller can choose to ignore the new interface. All implementations are updated to work with the new function prototypes. For Tegra I've included a patch to actually use the new ehci interface. Tom, Stephen, can I get an ACK from you for this, so Marek can take this through his USB tree? All patches now rebased onto u-boot-usb/master. Patch 3 also includes some cosmetic changes, to make the output of the usb commands more readable. On my Colibri T20, with a total of 3 usb controllers of which 2 are enabled in the device tree, output now looks like this: Tegra20 (Colibri) # usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... 2 USB Device(s) found USB1: USB EHCI 1.00 scanning bus 1 for devices... 2 USB Device(s) found USB2: lowlevel init failed scanning usb for storage devices... 1 Storage Device(s) found scanning usb for ethernet devices... 1 Ethernet Device(s) found Tegra20 (Colibri) # usb tree USB device tree: 1 Hub (480 Mb/s, 0mA) | u-boot EHCI Host Controller | +-2 Mass Storage (480 Mb/s, 200mA) SanDisk U3 Titanium 2845221DC342AE8F 3 Hub (480 Mb/s, 0mA) | u-boot EHCI Host Controller | +-4 Vendor specific (480 Mb/s, 4mA) ASIX Elec. Corp. AX88772B 000001 Lucas Stach (4): usb: lowlevel interface change to support multiple controllers usb: ehci: rework to take advantage of new lowlevel interface usb: add support for multiple usb controllers tegra20: port to new ehci interface arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c | 4 +- arch/arm/cpu/armv7/tegra20/usb.c | 15 +--- arch/arm/include/asm/arch-tegra20/usb.h | 4 +- arch/arm/include/asm/ehci-omap.h | 10 ++- arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c | 4 +- arch/powerpc/cpu/mpc5xxx/usb_ohci.c | 4 +- arch/powerpc/cpu/ppc4xx/usb_ohci.c | 4 +- arch/sparc/cpu/leon3/usb_uhci.c | 4 +- arch/sparc/lib/bootm.c | 2 +- board/htkw/mcx/mcx.c | 6 +- board/mpl/common/usb_uhci.c | 4 +- board/technexion/twister/twister.c | 6 +- board/teejet/mt_ventoux/mt_ventoux.c | 6 +- board/ti/beagle/beagle.c | 6 +- board/ti/panda/panda.c | 6 +- common/cmd_usb.c | 16 +++- common/usb.c | 108 +++++++++++----------- common/usb_hub.c | 2 +- common/usb_storage.c | 2 +- drivers/usb/eth/usb_ether.c | 2 +- drivers/usb/host/ehci-armada100.c | 15 ++-- drivers/usb/host/ehci-atmel.c | 11 ++- drivers/usb/host/ehci-core.h | 29 ------ drivers/usb/host/ehci-exynos.c | 15 ++-- drivers/usb/host/ehci-fsl.c | 15 ++-- drivers/usb/host/ehci-hcd.c | 124 ++++++++++++++------------ drivers/usb/host/ehci-ixp4xx.c | 15 ++-- drivers/usb/host/ehci-marvell.c | 15 ++-- drivers/usb/host/ehci-mpc512x.c | 25 ++---- drivers/usb/host/ehci-mx5.c | 11 ++- drivers/usb/host/ehci-mx6.c | 11 ++- drivers/usb/host/ehci-mxc.c | 11 ++- drivers/usb/host/ehci-mxs.c | 20 +++-- drivers/usb/host/ehci-omap.c | 10 ++- drivers/usb/host/ehci-pci.c | 15 ++-- drivers/usb/host/ehci-ppc4xx.c | 11 ++- drivers/usb/host/ehci-tegra.c | 14 ++- drivers/usb/host/ehci-vct.c | 9 +- drivers/usb/host/ehci.h | 4 +- drivers/usb/host/isp116x-hcd.c | 4 +- drivers/usb/host/ohci-hcd.c | 4 +- drivers/usb/host/r8a66597-hcd.c | 4 +- drivers/usb/host/sl811-hcd.c | 4 +- drivers/usb/musb/musb_hcd.c | 4 +- include/usb.h | 10 ++- include/usb/mv_udc.h | 2 +- 46 Dateien geändert, 309 Zeilen hinzugefügt(+), 318 Zeilen entfernt(-) delete mode 100644 drivers/usb/host/ehci-core.h -- 1.7.11.4

1 4

[U-Boot] Please pull u-boot-mpc85xx (for v2012.10)
by Kumar Gala 25 Sep '12

25 Sep '12

Tom, Sorry for both sending this and the late request. I think Andy's been swamped with some chip bringup and lost notice of window (thus my sending this request). Would be good to get this stuff (and some fixes, etc) into v2012.10. Thanks - k The following changes since commit ee1f4caaa2a3f79d692155eec8a4c7289d60e106: Tom Rini (1): Prepare v2012.10-rc1 are available in the git repository at: git://git.denx.de/u-boot-mpc85xx.git master Andy Fleming (1): Revert "powerpc: Fix declaration type for I/O functions" Joakim Tjernlund (2): mpc85xx: Initial SP alignment is wrong. powerpc: Stack Pointer not properly aligned Kumar Gala (3): Add e6500 processor detection Add IFC offset for DPAA/Corenet platforms Added new ext fields to IFC Liu Gang (6): powerpc/corenet_ds: Update README.srio-boot-corenet powerpc/corenet_ds: Get rid of the SRIOBOOT_MASTER build target powerpc/corenet_ds: Get rid of the CONFIG_SRIOBOOT_SLAVE_PORTx macro powerpc/corenet_ds: Update README and README.srio-pcie-boot-corenet powerpc/corenet_ds: Master module for boot from PCIE powerpc/corenet_ds: Slave module for boot from PCIE Matthew McClintock (6): p1014rdb: set ddr bus width properly depending on SVR p1010rdb: fix ddr values for p1014rdb (setting bus width to 16bit) powerpc/p1010rdb: nandboot: compare SVR properly nand_spl: update udelay for Freescale boards nand_spl: p1023rds: wait before enabling DDR controller nand_spl: change out_be32 to raw_writel and depend on subsequent sync Paul Gortmaker (1): mpc85xx: use LCRR_DBYP define instead of raw constant Prabhakar Kushwaha (2): powerpc/mpc85xx:Enable debugger support to missed e500v2 SoC powerpc/mpc85xx: Add IFC LAW target ID for FSL High-End SoC Scott Wood (6): nand/fsl_elbc: shrink SPL a bit by converting out_be32() to __raw_writel() powerpc/fsl-corenet: remove dead variant symbols powerpc/fsl-corenet: work around erratum A004510 powerpc/85xx: clear out TLB on boot powerpc/p1_p2_rdb_pc: print -PC suffix in board name powerpc/mpc85xx/p1_p2_rdb: add all LAWs during SPL Shaohui Xie (1): powerpc/CoreNet: add tool to support pbl image build. Timur Tabi (6): powerpc/85xx: add support for FM2 DTSEC5 fm-eth: add function fm_info_get_phy_address() powerpc/85xx: introduce function serdes_device_from_fm_port() fm-eth: use fdt_status_disabled() function in ft_fixup_port() powerpc/85xx: get rid of enum board_slots in P4080 MDIO driver powerpc/85xx: remove support for the Freescale P3060 York Sun (14): powerpc/mpc85xx: Make NMG_CPU_A011 workaround conditional powerpc/mpc8xxx: Remove P1015 and P1016 from CPU list powerpc/mpc8xxx: Add immap for topology and rcpm registers powerpc/mpc8xxx: use topology registers to calculate number of cores powerpc/mpc8xxx: fix core id for multicore booting powerpc/mpc85xx: Skip zero values for DDR debug registers powerpc/mpc8xxx: Add fine timing support for DDR3 powerpc/mpc8xxx: Add support for cas latency 12 and above powerpc/mpc8xxx: Enable 3-way and 4-way DDR interleaving powerpc/mpc8xxx: Fix bug for extended DDR timing powerpc/mpc8xxx DDR: Fix CAS latency calculation powerpc/mpc8xxx DDR: Fall back to raw timing for first controller only powerpc/mpc8xxx DDR: Fix interactive DDR debugging powerpc/mpc8xxx: Move HWCONFIG_BUFFER_SIZE into config.h Makefile | 6 + README | 37 +- arch/powerpc/cpu/mpc85xx/Makefile | 10 - arch/powerpc/cpu/mpc85xx/cmd_errata.c | 9 +- arch/powerpc/cpu/mpc85xx/cpu.c | 15 +- arch/powerpc/cpu/mpc85xx/cpu_init.c | 52 ++- arch/powerpc/cpu/mpc85xx/ddr-gen3.c | 26 +- arch/powerpc/cpu/mpc85xx/fdt.c | 7 +- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 8 +- arch/powerpc/cpu/mpc85xx/p3060_ids.c | 117 ----- arch/powerpc/cpu/mpc85xx/p3060_serdes.c | 118 ----- arch/powerpc/cpu/mpc85xx/release.S | 87 +++- arch/powerpc/cpu/mpc85xx/speed.c | 3 +- arch/powerpc/cpu/mpc85xx/start.S | 376 +++++++++++++-- arch/powerpc/cpu/mpc8xxx/cpu.c | 68 ++- arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c | 223 ++++----- arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c | 25 +- arch/powerpc/cpu/mpc8xxx/ddr/interactive.c | 26 +- .../cpu/mpc8xxx/ddr/lc_common_dimm_params.c | 18 +- arch/powerpc/cpu/mpc8xxx/ddr/main.c | 307 +++++++------ arch/powerpc/cpu/mpc8xxx/ddr/options.c | 212 ++++++--- arch/powerpc/cpu/mpc8xxx/ddr/util.c | 67 ++- arch/powerpc/cpu/mpc8xxx/fdt.c | 3 +- arch/powerpc/cpu/mpc8xxx/fsl_ifc.c | 12 + arch/powerpc/cpu/mpc8xxx/srio.c | 153 +++---- arch/powerpc/include/asm/config.h | 4 + arch/powerpc/include/asm/config_mpc85xx.h | 133 +----- arch/powerpc/include/asm/fsl_ddr_dimm_params.h | 1 + arch/powerpc/include/asm/fsl_ddr_sdram.h | 8 + arch/powerpc/include/asm/fsl_ifc.h | 18 +- arch/powerpc/include/asm/fsl_law.h | 13 +- arch/powerpc/include/asm/fsl_serdes.h | 1 + arch/powerpc/include/asm/fsl_srio.h | 8 +- arch/powerpc/include/asm/immap_85xx.h | 101 +++- arch/powerpc/include/asm/io.h | 20 +- arch/powerpc/include/asm/mmu.h | 4 + arch/powerpc/include/asm/mp.h | 6 + arch/powerpc/include/asm/processor.h | 8 +- arch/powerpc/lib/board.c | 18 +- board/freescale/common/Makefile | 2 - board/freescale/common/fman.c | 31 ++ board/freescale/common/fman.h | 2 + board/freescale/common/p_corenet/law.c | 13 - board/freescale/common/p_corenet/tlb.c | 18 +- board/freescale/corenet_ds/eth_p4080.c | 59 +-- board/freescale/corenet_ds/pbi.cfg | 51 +++ board/freescale/corenet_ds/rcw_p3041ds.cfg | 11 + board/freescale/corenet_ds/rcw_p4080ds.cfg | 11 + board/freescale/corenet_ds/rcw_p5020ds.cfg | 11 + board/freescale/mpc8540ads/mpc8540ads.c | 6 +- board/freescale/mpc8541cds/mpc8541cds.c | 6 +- board/freescale/mpc8555cds/mpc8555cds.c | 6 +- board/freescale/mpc8560ads/mpc8560ads.c | 6 +- board/freescale/p1010rdb/ddr.c | 7 +- board/freescale/p1_p2_rdb_pc/law.c | 2 - board/freescale/p3060qds/Makefile | 54 --- board/freescale/p3060qds/README | 110 ----- board/freescale/p3060qds/ddr.c | 248 ---------- board/freescale/p3060qds/eth.c | 482 -------------------- board/freescale/p3060qds/fixed_ddr.c | 214 --------- board/freescale/p3060qds/p3060qds.c | 342 -------------- board/freescale/p3060qds/p3060qds_qixis.h | 74 --- boards.cfg | 13 +- common/env_remote.c | 4 +- common/image.c | 1 + doc/README.fsl-ddr | 36 +- doc/README.pblimage | 114 +++++ doc/README.srio-boot-corenet | 103 ----- doc/README.srio-pcie-boot-corenet | 112 +++++ drivers/misc/fsl_law.c | 54 +++ drivers/net/fm/Makefile | 2 - drivers/net/fm/init.c | 30 +- drivers/net/fm/p3060.c | 97 ---- drivers/pci/fsl_pci_init.c | 116 +++++ drivers/qe/uec.c | 15 +- include/configs/P2041RDB.h | 58 ++- include/configs/P3060QDS.h | 48 -- include/configs/P4080DS.h | 1 + include/configs/P5020DS.h | 2 +- include/configs/corenet_ds.h | 83 ++-- include/configs/p1_p2_rdb_pc.h | 10 +- include/ddr_spd.h | 7 +- include/fm_eth.h | 2 + include/image.h | 1 + nand_spl/board/freescale/common.c | 40 ++ nand_spl/board/freescale/p1010rdb/Makefile | 6 +- nand_spl/board/freescale/p1010rdb/nand_boot.c | 77 ++-- nand_spl/board/freescale/p1023rds/Makefile | 6 +- nand_spl/board/freescale/p1023rds/nand_boot.c | 59 ++- nand_spl/board/freescale/p1_p2_rdb_pc/Makefile | 6 +- nand_spl/board/freescale/p1_p2_rdb_pc/nand_boot.c | 60 ++- nand_spl/nand_boot_fsl_elbc.c | 47 +- tools/Makefile | 2 + tools/mkimage.c | 15 + tools/mkimage.h | 3 + tools/pblimage.c | 331 ++++++++++++++ .../p3060qds/p3060qds.h => tools/pblimage.h | 26 +- 97 files changed, 2682 insertions(+), 2999 deletions(-) delete mode 100644 arch/powerpc/cpu/mpc85xx/p3060_ids.c delete mode 100644 arch/powerpc/cpu/mpc85xx/p3060_serdes.c create mode 100644 board/freescale/corenet_ds/pbi.cfg create mode 100644 board/freescale/corenet_ds/rcw_p3041ds.cfg create mode 100644 board/freescale/corenet_ds/rcw_p4080ds.cfg create mode 100644 board/freescale/corenet_ds/rcw_p5020ds.cfg delete mode 100644 board/freescale/p3060qds/Makefile delete mode 100644 board/freescale/p3060qds/README delete mode 100644 board/freescale/p3060qds/ddr.c delete mode 100644 board/freescale/p3060qds/eth.c delete mode 100644 board/freescale/p3060qds/fixed_ddr.c delete mode 100644 board/freescale/p3060qds/p3060qds.c delete mode 100644 board/freescale/p3060qds/p3060qds_qixis.h create mode 100644 doc/README.pblimage delete mode 100644 doc/README.srio-boot-corenet create mode 100644 doc/README.srio-pcie-boot-corenet delete mode 100644 drivers/net/fm/p3060.c delete mode 100644 include/configs/P3060QDS.h create mode 100644 nand_spl/board/freescale/common.c create mode 100644 tools/pblimage.c rename board/freescale/p3060qds/p3060qds.h => tools/pblimage.h (60%)

3 2

[U-Boot] [PATCH v4 0/4] USB multi controller
by Lucas Stach 25 Sep '12

25 Sep '12

V4: Fixed build failures in fsl and mxs ehci code. Also rebased on the latest usb/master and did MAKEALL -a powerpc in addition to MAKEALL -a arm. V3: Stephen ran into some problems applying this, as it seems my tree wasn't as clean as it should have been. Sorry for the inconvenience. This should now be fixed. Hi all, this is a follow up on the patch "USB: EHCI: Initialize multiple USB controllers at once" from Jim Lin. It takes some of the code but has undergone some heavy reworking. When we remove the ifdef horror from the above mentioned patch it's mostly a big interface change to the usb subsystem. As this creates a lot of churn I've split this up into a series. Every patch is self contained so it doesn't break compiles and *should* not regress any functionality on it's own. At least the series is bisectable in case anything goes wrong. I've compile tested all the ARM configs. Both the lowlevel usb and ehci interface change are backward compatible, so implementations that only use one controller can choose to ignore the new interface. All implementations are updated to work with the new function prototypes. For Tegra I've included a patch to actually use the new ehci interface. Tom, Stephen, can I get an ACK from you for this, so Marek can take this through his USB tree? All patches now rebased onto u-boot-usb/master. Patch 3 also includes some cosmetic changes, to make the output of the usb commands more readable. On my Colibri T20, with a total of 3 usb controllers of which 2 are enabled in the device tree, output now looks like this: Tegra20 (Colibri) # usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... 2 USB Device(s) found USB1: USB EHCI 1.00 scanning bus 1 for devices... 2 USB Device(s) found USB2: lowlevel init failed scanning usb for storage devices... 1 Storage Device(s) found scanning usb for ethernet devices... 1 Ethernet Device(s) found Tegra20 (Colibri) # usb tree USB device tree: 1 Hub (480 Mb/s, 0mA) | u-boot EHCI Host Controller | +-2 Mass Storage (480 Mb/s, 200mA) SanDisk U3 Titanium 2845221DC342AE8F 3 Hub (480 Mb/s, 0mA) | u-boot EHCI Host Controller | +-4 Vendor specific (480 Mb/s, 4mA) ASIX Elec. Corp. AX88772B 000001 Lucas Stach (4): usb: lowlevel interface change to support multiple controllers usb: ehci: rework to take advantage of new lowlevel interface usb: add support for multiple usb controllers tegra20: port to new ehci interface arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c | 4 +- arch/arm/cpu/armv7/tegra20/usb.c | 15 +--- arch/arm/include/asm/arch-tegra20/usb.h | 4 +- arch/arm/include/asm/ehci-omap.h | 10 ++- arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c | 4 +- arch/powerpc/cpu/mpc5xxx/usb_ohci.c | 4 +- arch/powerpc/cpu/ppc4xx/usb_ohci.c | 4 +- arch/sparc/cpu/leon3/usb_uhci.c | 4 +- arch/sparc/lib/bootm.c | 2 +- board/htkw/mcx/mcx.c | 6 +- board/mpl/common/usb_uhci.c | 4 +- board/technexion/twister/twister.c | 6 +- board/teejet/mt_ventoux/mt_ventoux.c | 6 +- board/ti/beagle/beagle.c | 6 +- board/ti/panda/panda.c | 6 +- common/cmd_usb.c | 16 +++- common/usb.c | 108 +++++++++++----------- common/usb_hub.c | 2 +- common/usb_storage.c | 2 +- drivers/usb/eth/usb_ether.c | 2 +- drivers/usb/host/ehci-armada100.c | 15 ++-- drivers/usb/host/ehci-atmel.c | 11 ++- drivers/usb/host/ehci-core.h | 29 ------ drivers/usb/host/ehci-exynos.c | 15 ++-- drivers/usb/host/ehci-fsl.c | 15 ++-- drivers/usb/host/ehci-hcd.c | 124 ++++++++++++++------------ drivers/usb/host/ehci-ixp4xx.c | 15 ++-- drivers/usb/host/ehci-marvell.c | 15 ++-- drivers/usb/host/ehci-mpc512x.c | 25 ++---- drivers/usb/host/ehci-mx5.c | 11 ++- drivers/usb/host/ehci-mx6.c | 11 ++- drivers/usb/host/ehci-mxc.c | 11 ++- drivers/usb/host/ehci-mxs.c | 20 +++-- drivers/usb/host/ehci-omap.c | 10 ++- drivers/usb/host/ehci-pci.c | 15 ++-- drivers/usb/host/ehci-ppc4xx.c | 11 ++- drivers/usb/host/ehci-tegra.c | 14 ++- drivers/usb/host/ehci-vct.c | 9 +- drivers/usb/host/ehci.h | 4 +- drivers/usb/host/isp116x-hcd.c | 4 +- drivers/usb/host/ohci-hcd.c | 4 +- drivers/usb/host/r8a66597-hcd.c | 4 +- drivers/usb/host/sl811-hcd.c | 4 +- drivers/usb/musb/musb_hcd.c | 4 +- include/usb.h | 10 ++- include/usb/mv_udc.h | 2 +- 46 Dateien geändert, 309 Zeilen hinzugefügt(+), 318 Zeilen entfernt(-) delete mode 100644 drivers/usb/host/ehci-core.h -- 1.7.11.4

2 5

[U-Boot] [PATCH] ARM: arm1176: Define arch_cpu_init() at the SoC level
by Stephen Warren 25 Sep '12

25 Sep '12

Commit 86c6326 "ARM: arm1176: enable instruction cache in arch_cpu_init()" defined arch_cpu_init() in a file that is shared across all arm1176 SoCs. tnetv107x already implemented this function, which caused linking to break. Move the new conflicting arch_cpu_init() into arm1176/bcm2835/init.c so that it doesn't conflict; grep indicates this function is usually defined at the SoC-level, not the CPU-level, at least for ARM. Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- arch/arm/cpu/arm1176/bcm2835/Makefile | 2 +- arch/arm/cpu/arm1176/bcm2835/init.c | 24 ++++++++++++++++++++++++ arch/arm/cpu/arm1176/cpu.c | 7 ------- 3 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 arch/arm/cpu/arm1176/bcm2835/init.c diff --git a/arch/arm/cpu/arm1176/bcm2835/Makefile b/arch/arm/cpu/arm1176/bcm2835/Makefile index 4ea6d6b..95da6a8 100644 --- a/arch/arm/cpu/arm1176/bcm2835/Makefile +++ b/arch/arm/cpu/arm1176/bcm2835/Makefile @@ -17,7 +17,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o SOBJS := lowlevel_init.o -COBJS := reset.o timer.o +COBJS := init.o reset.o timer.o SRCS := $(SOBJS:.o=.c) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/arch/arm/cpu/arm1176/bcm2835/init.c b/arch/arm/cpu/arm1176/bcm2835/init.c new file mode 100644 index 0000000..e90d3bb --- /dev/null +++ b/arch/arm/cpu/arm1176/bcm2835/init.c @@ -0,0 +1,24 @@ +/* + * (C) Copyright 2012 Stephen Warren + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * 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. + */ + +#include <common.h> + +int arch_cpu_init(void) +{ + icache_enable(); + + return 0; +} diff --git a/arch/arm/cpu/arm1176/cpu.c b/arch/arm/cpu/arm1176/cpu.c index 532a90b..c0fd114 100644 --- a/arch/arm/cpu/arm1176/cpu.c +++ b/arch/arm/cpu/arm1176/cpu.c @@ -65,10 +65,3 @@ static void cache_flush (void) /* mem barrier to sync things */ asm ("mcr p15, 0, %0, c7, c10, 4": :"r" (0)); } - -int arch_cpu_init(void) -{ - icache_enable(); - - return 0; -} -- 1.7.9.5

4 3

[U-Boot] [PATCH v2] MAKEALL: fix per arch board lists
by Allen Martin 25 Sep '12

25 Sep '12

The LIST_arm rule included the Atmel boards twice (by virtue of including both LIST_at91 and LIST_ARM9) and was missing all the arm720t, arm946es, and arm1176 boards. Change this list to use boards_by_arch() which is less error prone. After this change "./MAKEALL arm" and "./MAKEALL -a arm" build the same boards. Also fix up some missing and duplicate boards to arm, mips, and m68k. Signed-off-by: Allen Martin <amartin(a)nvidia.com> --- MAKEALL | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/MAKEALL b/MAKEALL index 6b9ff30..24d4fff 100755 --- a/MAKEALL +++ b/MAKEALL @@ -331,18 +331,27 @@ LIST_ppc=" \ LIST_SA="$(boards_by_cpu sa1100)" ######################################################################### +## ARM7 Systems +######################################################################### + +LIST_ARM7="$(boards_by_cpu arm720t)" + +######################################################################### ## ARM9 Systems ######################################################################### LIST_ARM9="$(boards_by_cpu arm920t) \ $(boards_by_cpu arm926ejs) \ $(boards_by_cpu arm925t) \ + $(boards_by_cpu arm946es) \ " ######################################################################### ## ARM11 Systems ######################################################################### -LIST_ARM11="$(boards_by_cpu arm1136)" +LIST_ARM11="$(boards_by_cpu arm1136) \ + $(boards_by_cpu arm1176) \ +" ######################################################################### ## ARMV7 Systems @@ -368,16 +377,7 @@ LIST_ixp="$(boards_by_cpu ixp)" ## ARM groups ######################################################################### -LIST_arm=" \ - ${LIST_SA} \ - ${LIST_ARM9} \ - ${LIST_ARM10} \ - ${LIST_ARM11} \ - ${LIST_ARMV7} \ - ${LIST_at91} \ - ${LIST_pxa} \ - ${LIST_ixp} \ -" +LIST_arm="$(boards_by_arch arm)" ######################################################################### ## MIPS Systems (default = big endian) @@ -385,6 +385,9 @@ LIST_arm=" \ LIST_mips4kc=" \ incaip \ + incaip_100MHz \ + incaip_133MHz \ + incaip_150MHz \ qemu_mips \ vct_platinum \ vct_platinum_small \ @@ -458,14 +461,7 @@ LIST_microblaze="$(boards_by_arch microblaze)" ## ColdFire Systems ######################################################################### -LIST_m68k="$(boards_by_arch m68k) - EB+MCF-EV123 \ - EB+MCF-EV123_internal \ - M52277EVB \ - M5235EVB \ - M54451EVB \ - M54455EVB \ -" +LIST_m68k="$(boards_by_arch m68k)" LIST_coldfire=${LIST_m68k} ######################################################################### -- 1.7.9.5

2 2

[U-Boot] [PATCH resend 0/3] Pending Tegra2 patches
by Lucas Stach 25 Sep '12

25 Sep '12

Hello Tom, please take those patches through the Tegra tree. The first two are split out from the ULPI series, as they are only related to Tegra and as such should really go through the Tegra tree. The last one is just a friendly reminder that this patch is still pending. The are no changes from previous posted versions, just rebased on top of current tegra/next. Thanks, Lucas Lucas Stach (3): tegra20: complete periph_id enum tegra20: add clock_set_pllout function tegra20: rework UART GPIO handling arch/arm/cpu/arm720t/tegra20/board.h | 2 +- arch/arm/cpu/arm720t/tegra20/spl.c | 4 --- arch/arm/cpu/tegra20-common/clock.c | 39 +++++++++++++++++++++++++++++ arch/arm/cpu/tegra20-common/warmboot_avp.c | 2 +- arch/arm/include/asm/arch-tegra20/clk_rst.h | 11 ++++++-- arch/arm/include/asm/arch-tegra20/clock.h | 25 ++++++++++++++++++ board/avionic-design/common/tamonten.c | 7 ------ board/compal/paz00/paz00.c | 7 ------ board/compulab/trimslice/trimslice.c | 7 ------ board/nvidia/common/board.c | 10 +++++--- board/nvidia/harmony/harmony.c | 7 ------ board/nvidia/seaboard/seaboard.c | 2 +- board/nvidia/whistler/whistler.c | 7 ------ 13 Dateien geändert, 82 Zeilen hinzugefügt(+), 48 Zeilen entfernt(-) -- 1.7.11.4

1 3

[U-Boot] ARMv7 and unaligned access issues
by Tom Rini 25 Sep '12

25 Sep '12

Hi Albert (and everyone else), For background, we've discussed the problem of ARM and unaligned access before at: http://comments.gmane.org/gmane.comp.boot-loaders.u-boot/132780 Now, to try and summarize things: (1): All ARMv7 hardware must support unaligned access, if set. (2): All gcc 4.7 (and gcc 4.6 from Linaro) default to saying this access will be enabled / supported. (3): In some cases these gcc versions will store string constants unaligned. For example, char mac[16] = "ethaddr" in common/fdt_support.c::fdt_fixup_ethernet (at least one more example exists today, fs/ubifs/super.c::ubifs_mount). This is a valid C construct. Now, how do we want to handle this? We can do: (a): Tell gcc to use -mno-unaligned-access (b): Set the correct bit to allow unaligned access on ARMv7 (c): Case-by-case fixup of code. Option 'a' is what we did for v2012.07 with an immediate revert and plan to "fix" things for the next release. Option 'b' is what started the above mentioned thread. Option 'c' seems to be the path forward based on reverting 'a'. However, this seems very problematic as we're disallowing valid C code and we have to be sure that we don't introduce further breakage later. In my read of the original thread it doesn't seem like this was the intended consequence of saying we'll fix up the code. I would suggest we follow the kernel's lead here and go back and do option b. -- Tom

1 0