July 2014 - U-Boot

[U-Boot] [PATCH v1 0/3] ARM: omap: add support for GPMC and ELM controllers on OMAP4 and OMAP5 platforms
by Pekon Gupta 09 Jul '14

09 Jul '14

This patch series intends to: - Add support for GPMC and ELM controllers for OMAP4 and OMAP5 platform devices by moving all generic arch specific code shared between arch/AM33xx, arch/OMAP4 and arch/OMAP5 into arch/omap-common/ - Separate out arch specific header for future scalability - Remove redundant code Pekon Gupta (3): ARM: omap4: add platform specific info for GPMC and ELM controllers ARM: omap5: add platform specific info for GPMC and ELM controllers ARM: omap: merge GPMC initialization code for all platform arch/arm/cpu/armv7/am33xx/Makefile | 1 - arch/arm/cpu/armv7/omap-common/Makefile | 4 - .../{am33xx/mem.c => omap-common/mem-common.c} | 39 ++++++ arch/arm/cpu/armv7/omap3/Makefile | 1 - arch/arm/cpu/armv7/omap3/mem.c | 139 --------------------- arch/arm/include/asm/arch-omap4/cpu.h | 5 +- arch/arm/include/asm/arch-omap4/hardware.h | 26 ++++ arch/arm/include/asm/arch-omap4/mem.h | 62 +++++++++ arch/arm/include/asm/arch-omap4/omap.h | 3 - arch/arm/include/asm/arch-omap5/cpu.h | 5 +- arch/arm/include/asm/arch-omap5/hardware.h | 26 ++++ arch/arm/include/asm/arch-omap5/mem.h | 62 +++++++++ arch/arm/include/asm/arch-omap5/omap.h | 3 - 13 files changed, 219 insertions(+), 157 deletions(-) rename arch/arm/cpu/armv7/{am33xx/mem.c => omap-common/mem-common.c} (68%) delete mode 100644 arch/arm/cpu/armv7/omap3/mem.c create mode 100644 arch/arm/include/asm/arch-omap4/hardware.h create mode 100644 arch/arm/include/asm/arch-omap4/mem.h create mode 100644 arch/arm/include/asm/arch-omap5/hardware.h create mode 100644 arch/arm/include/asm/arch-omap5/mem.h -- 1.8.5.1.163.gd7aced9

5 15

[U-Boot] [[U-boot] [Patch 0/6] Optimize Keystone2 code for other SoC types
by Ivan Khoronzhuk 09 Jul '14

09 Jul '14

Optimize Keystone2 code. The Keystone2 code is going to be updated to support several SoC types. Before adding new SoC type it's good to add some general optimizations in order to avoid re patching after. So this series holds the optimizations. Based on "[U-boot] [Patch v2 0/3] Add support for NAND U-boot image upgrade" https://www.mail-archive.com/u-boot@lists.denx.de/msg141655.html Hao Zhang (3): keystone2: ddr: add DDR3 PHY configs updated for PG 2.0 keystone2: move cpu_to_bus() to keystone.c keystone2: add possibility to turn off all dsps Ivan Khoronzhuk (3): ARM: keystone2: psc: use common PSC base keystone: ddr3: add ddr3.h to hold ddr3 API ARM: keystone2: keystone_nav: make it dependent on keystone driver arch/arm/cpu/armv7/keystone/Makefile | 3 +- arch/arm/cpu/armv7/keystone/ddr3.c | 25 ++++- arch/arm/cpu/armv7/keystone/keystone.c | 87 +++++++++++++++++ arch/arm/cpu/armv7/keystone/psc.c | 42 ++++----- arch/arm/include/asm/arch-keystone/ddr3.h | 56 +++++++++++ arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 6 +- arch/arm/include/asm/arch-keystone/hardware.h | 50 +++------- arch/arm/include/asm/arch-keystone/mon.h | 15 +++ board/ti/k2hk_evm/board.c | 17 +--- board/ti/k2hk_evm/ddr3.c | 103 ++++++++++++++++++--- 10 files changed, 309 insertions(+), 95 deletions(-) create mode 100644 arch/arm/cpu/armv7/keystone/keystone.c create mode 100644 arch/arm/include/asm/arch-keystone/ddr3.h create mode 100644 arch/arm/include/asm/arch-keystone/mon.h -- 1.8.3.2

1 6

[U-Boot] [PATCH] ARM: OMAP4/5: Change omap4_sdp/panda and omap5_uevm maintainer
by Lokesh Vutla 09 Jul '14

09 Jul '14

Updating omap4_sdp/panda and omap5_uevm maintainer. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- boards.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boards.cfg b/boards.cfg index f16a0e6..1c426e6 100644 --- a/boards.cfg +++ b/boards.cfg @@ -363,13 +363,13 @@ Active arm armv7 omap3 ti evm Active arm armv7 omap3 ti sdp3430 omap3_sdp3430 - Nishanth Menon <nm(a)ti.com> Active arm armv7 omap3 timll devkit8000 devkit8000 - Thomas Weber <weber(a)corscience.de> Active arm armv7 omap4 gumstix duovero duovero - Ash Charles <ash(a)gumstix.com> -Active arm armv7 omap4 ti panda omap4_panda - Sricharan R <r.sricharan(a)ti.com> -Active arm armv7 omap4 ti sdp4430 omap4_sdp4430 - Sricharan R <r.sricharan(a)ti.com> +Active arm armv7 omap4 ti panda omap4_panda - Lokesh Vutla <lokeshvutla(a)ti.com> +Active arm armv7 omap4 ti sdp4430 omap4_sdp4430 - Lokesh Vutla <lokeshvutla(a)ti.com> Active arm armv7 omap5 compulab cm_t54 cm_t54 - Dmitry Lifshitz <lifshitz(a)compulab.co.il> Active arm armv7 omap5 ti dra7xx dra7xx_evm dra7xx_evm:CONS_INDEX=1 Lokesh Vutla <lokeshvutla(a)ti.com> Active arm armv7 omap5 ti dra7xx dra7xx_evm_qspiboot dra7xx_evm:CONS_INDEX=1,QSPI_BOOT Lokesh Vutla <lokeshvutla(a)ti.com> Active arm armv7 omap5 ti dra7xx dra7xx_evm_uart3 dra7xx_evm:CONS_INDEX=3,SPL_YMODEM_SUPPORT Lokesh Vutla <lokeshvutla(a)ti.com> -Active arm armv7 omap5 ti omap5_uevm omap5_uevm - - +Active arm armv7 omap5 ti omap5_uevm omap5_uevm - Lokesh Vutla <lokeshvutla(a)ti.com> Active arm armv7 rmobile atmark-techno armadillo-800eva armadillo-800eva - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Active arm armv7 rmobile kmc kzm9g kzm9g - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com>:Tetsuyuki Kobayashi <koba(a)kmckk.co.jp> Active arm armv7 rmobile renesas koelsch koelsch - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> -- 1.7.9.5

4 3

[U-Boot] [PATCH] doc: Add zynq fragment to git-mailrc file
by Michal Simek 09 Jul '14

09 Jul '14

Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- doc/git-mailrc | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/git-mailrc b/doc/git-mailrc index 3d97d306144d..ae7e7bfb5bba 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -62,6 +62,7 @@ alias sunxi uboot, ijc, jwrdegoede alias tegra uboot, sjg, Tom Warren <twarren(a)nvidia.com>, Stephen Warren <swarren(a)nvidia.com> alias tegra2 tegra alias ti uboot, trini +alias zynq uboot, monstr alias avr32 uboot, abiessmann -- 1.8.2.3

2 1

[U-Boot] [PULL]: small fixes from u-boot-imx
by Stefano Babic 09 Jul '14

09 Jul '14

Hi Tom, please pull from u-boot-imx - hopefully last fixes for the release. Thanks ! The following changes since commit 3f4c01d9f9d38e383f004dcd06c0d5661f2a57e0: mx25pdk: Remove CONFIG_SYS_GENERIC_BOARD (2014-06-26 10:17:19 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 157f45da91b306d71dbf3a51325352dc11bf16d1: mx6: soc: Update the comments of set_ldo_voltage() (2014-07-09 15:10:10 +0200) ---------------------------------------------------------------- Andre Renaud (1): MX6: Correct calculation of PLL_SYS Fabio Estevam (1): mx6: soc: Update the comments of set_ldo_voltage() Lothar Rubusch (2): ARM: m28evk: Update default environment ARM: m53evk: Update default environment Marek Vasut (4): ARM: m28evk: add needed commands and options ARM: m28evk: Adjust mtdparts ARM: m53evk: add needed commands and options ARM: m53evk: Adjust mtdparts settings arch/arm/cpu/armv7/mx6/clock.c | 2 +- arch/arm/cpu/armv7/mx6/soc.c | 5 +- include/configs/m28evk.h | 116 ++++++++++++++++++++++++++++++++++----- include/configs/m53evk.h | 122 +++++++++++++++++++++++++++++++++++++---- 4 files changed, 215 insertions(+), 30 deletions(-) -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] [PATCH] mx6: soc: Update the comments of set_ldo_voltage()
by Fabio Estevam 09 Jul '14

09 Jul '14

From: Fabio Estevam <fabio.estevam(a)freescale.com> Commit 3d622b78 (mx6: soc: Introduce set_ldo_voltage()) introduces set_ldo_voltage() function that can be used to set the voltages of any of the three LDO regulators controlled by the PMU_REG_CORE register. Prior to this commit there was a single set_vddsoc() which only configured the VDDSOC regulator. Update the comments to align with the new set_ldo_voltage() implementation. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- arch/arm/cpu/armv7/mx6/soc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 1725279..f20bdeb 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -124,10 +124,9 @@ static void clear_ldo_ramp(void) } /* - * Set the VDDSOC + * Set the PMU_REG_CORE register * - * Mask out the REG_CORE[22:18] bits (REG2_TRIG) and set - * them to the specified millivolt level. + * Set LDO_SOC/PU/ARM regulators to the specified millivolt level. * Possible values are from 0.725V to 1.450V in steps of * 0.025V (25mV). */ -- 1.8.3.2

2 1

[U-Boot] [PATCH] MX6: Correct calculation of PLL_SYS
by Andre Renaud 09 Jul '14

09 Jul '14

DIV_SELECT is used as Fout = Fin * div_select / 2.0, so we should do the shift after the multiply to avoid rounding errors Signed-off-by: Andre Renaud <andre(a)bluewatersys.com> --- arch/arm/cpu/armv7/mx6/clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index bd65a08..7dd83ec 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -80,7 +80,7 @@ static u32 decode_pll(enum pll_clocks pll, u32 infreq) div = __raw_readl(&imx_ccm->analog_pll_sys); div &= BM_ANADIG_PLL_SYS_DIV_SELECT; - return infreq * (div >> 1); + return (infreq * div) >> 1; case PLL_BUS: div = __raw_readl(&imx_ccm->analog_pll_528); div &= BM_ANADIG_PLL_528_DIV_SELECT; -- 1.7.9.5

2 1

[U-Boot] [PATCH 1/6] ARM: m28evk: add needed commands and options
by Marek Vasut 09 Jul '14

09 Jul '14

- "env ask", "env grep" and "setexpr" are needed for commissioning - add support for ext4 file systems - adjust default environment to use ext4 commands - add write support for (V)FAT and EXT4 - add bitmap and splashscreen support - print timestamp information for images Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> --- include/configs/m28evk.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 3e387c4..c3bdd4b 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -12,17 +12,25 @@ #define MACH_TYPE_M28EVK 3613 #define CONFIG_MACH_TYPE MACH_TYPE_M28EVK +#define CONFIG_FIT + +#define CONFIG_TIMESTAMP /* Print image info with timestamp */ + /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH #include <config_cmd_default.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DOS_PARTITION +#define CONFIG_FAT_WRITE +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_BMP #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT #define CONFIG_CMD_GPIO #define CONFIG_CMD_GREPENV @@ -145,7 +153,7 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP -#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10) +#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) #endif /* Booting Linux */ -- 2.0.0.rc2

3 8

[U-Boot] [Question] Any plan to refactor Generic Board Framework?
by Masahiro Yamada 09 Jul '14

09 Jul '14

Hi. The generic board code looks really dirty to me: common/board_f.c is sprinkled with ARCH/CPU/BOARD configs For example, #if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \ defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) bd->bi_pci_busfreq = get_PCI_freq(); bd->bi_opbfreq = get_OPB_freq(); #elif defined(CONFIG_XILINX_405) bd->bi_pci_busfreq = get_PCI_freq(); #endif or #if defined(CONFIG_8xx) || defined(CONFIG_MPC8260) || defined(CONFIG_5xx) || \ defined(CONFIG_E500) || defined(CONFIG_MPC86xx) bd->bi_immr_base = CONFIG_SYS_IMMR; /* base of IMMR register */ #endif #if defined(CONFIG_MPC5xxx) bd->bi_mbar_base = CONFIG_SYS_MBAR; /* base of internal registers */ #endif #if defined(CONFIG_MPC83xx) bd->bi_immrbar = CONFIG_SYS_IMMR; #endif Is there any plan to fix them? When? By whom? (They include some old platform macros such as CONFIG_8xx. Is it worth refactoring? If so, who will do it? ) Besides, there are many 'TODO' marks. But it seems nothing has happened so far... Now generic board is suppored in ARM, PPC, MIPS, Sandbox, ARC, x86. Accoding to doc/README.generic-board, we are expecting the other architectures will support it before October. I think we should start to do something now. If we keep going without any clean-up, I guess it will be messed up. Best Regards Masahiro Yamada

2 2

[U-Boot] [PATCH] build: define CPU only when arch/${ARCH}/cpu/${CPU} exists
by Masahiro Yamada 09 Jul '14

09 Jul '14

The directory arch/${ARCH}/cpu/${CPU} does not exist in avr32, blackfin, microblaze, nios2, openrisc, sandbox, x86. These architectures have only one CPU type. Defining CPU should not be required for such architectures. This commit allows cpu field (= the 3rd field of boards.cfg) to be kept blank. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Andreas Bießmann <andreas.devel(a)googlemail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Sonic Zhang <sonic.zhang(a)analog.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: Thomas Chou <thomas(a)wytron.com.tw> Cc: Stefan Kristiansson <stefan.kristiansson(a)saunalahti.fi> --- I built all the boards and compared MD5SUM. I confirmed that the same binaries are generated with/without this patch. .../sandbox/include/asm/{arch-sandbox => }/sound.h | 0 boards.cfg | 104 ++++++++++----------- config.mk | 5 +- drivers/sound/sandbox.c | 2 +- mkconfig | 11 ++- 5 files changed, 62 insertions(+), 60 deletions(-) rename arch/sandbox/include/asm/{arch-sandbox => }/sound.h (100%) diff --git a/arch/sandbox/include/asm/arch-sandbox/sound.h b/arch/sandbox/include/asm/sound.h similarity index 100% rename from arch/sandbox/include/asm/arch-sandbox/sound.h rename to arch/sandbox/include/asm/sound.h diff --git a/boards.cfg b/boards.cfg index 947f2bc..539e368 100644 --- a/boards.cfg +++ b/boards.cfg @@ -417,36 +417,36 @@ Active arm pxa - - vpac270 Active arm pxa - icpdas lp8x4x lp8x4x - Sergey Yanovich <ynvich(a)gmail.com> Active arm pxa - toradex - colibri_pxa270 - Marek Vasut <marek.vasut(a)gmail.com> Active arm sa1100 - - - jornada - Kristoffer Ericson <kristoffer.ericson(a)gmail.com> -Active avr32 at32ap at32ap700x atmel - atngw100mkii - Andreas Bießmann <andreas.devel(a)googlemail.com> -Active avr32 at32ap at32ap700x in-circuit - grasshopper - Andreas Bießmann <andreas.devel(a)googlemail.com> -Active avr32 at32ap at32ap700x mimc - mimc200 - Mark Jackson <mpfj(a)mimc.co.uk> -Active avr32 at32ap at32ap700x miromico - hammerhead - Alex Raimondi <alex.raimondi(a)miromico.ch> -Active blackfin blackfin - - - bct-brettl2 - Peter Meerwald <devel(a)bct-electronic.com> -Active blackfin blackfin - - - bf506f-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf518f-ezbrd - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf525-ucr2 - Haitao Zhang <hzhang(a)ucrobotics.com>:Chong Huang <chuang(a)ucrobotics.com> -Active blackfin blackfin - - - bf526-ezbrd - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf527-ad7160-eval - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf527-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf527-sdp - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf533-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf533-stamp - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf537-minotaur - Martin Strubel <strubel(a)section5.ch> -Active blackfin blackfin - - - bf537-pnav - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf537-srv1 - Martin Strubel <strubel(a)section5.ch> -Active blackfin blackfin - - - bf537-stamp - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf538f-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf548-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf561-acvilon - Valentin Yakovenkov <yakovenkov(a)niistt.ru> -Active blackfin blackfin - - - bf561-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - bf609-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> -Active blackfin blackfin - - - blackstamp - Wojtek Skulski <skulski(a)pas.rochester.edu>:Wojtek Skulski <info(a)skutek.com>:Benjamin Matthews <mben12(a)gmail.com> -Active blackfin blackfin - - - blackvme - Wojtek Skulski <skulski(a)pas.rochester.edu>:Wojtek Skulski <info(a)skutek.com>:Benjamin Matthews <mben12(a)gmail.com> -Active blackfin blackfin - - - br4 - Dimitar Penev <dpn(a)switchfin.org> -Active blackfin blackfin - - - dnp5370 - M.Hasewinkel (MHA) <info(a)ssv-embedded.de> -Active blackfin blackfin - - - ibf-dsp561 - I-SYST Micromodule <support(a)i-syst.com> -Active blackfin blackfin - - - pr1 - Dimitar Penev <dpn(a)switchfin.org> -Active blackfin blackfin - - bf527-ezkit bf527-ezkit-v2 bf527-ezkit:BF527_EZKIT_REV_2_1 Sonic Zhang <sonic.adi(a)gmail.com> +Active avr32 - at32ap700x atmel - atngw100mkii - Andreas Bießmann <andreas.devel(a)googlemail.com> +Active avr32 - at32ap700x in-circuit - grasshopper - Andreas Bießmann <andreas.devel(a)googlemail.com> +Active avr32 - at32ap700x mimc - mimc200 - Mark Jackson <mpfj(a)mimc.co.uk> +Active avr32 - at32ap700x miromico - hammerhead - Alex Raimondi <alex.raimondi(a)miromico.ch> +Active blackfin - - - - bct-brettl2 - Peter Meerwald <devel(a)bct-electronic.com> +Active blackfin - - - - bf506f-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf518f-ezbrd - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf525-ucr2 - Haitao Zhang <hzhang(a)ucrobotics.com>:Chong Huang <chuang(a)ucrobotics.com> +Active blackfin - - - - bf526-ezbrd - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf527-ad7160-eval - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf527-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf527-sdp - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf533-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf533-stamp - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf537-minotaur - Martin Strubel <strubel(a)section5.ch> +Active blackfin - - - - bf537-pnav - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf537-srv1 - Martin Strubel <strubel(a)section5.ch> +Active blackfin - - - - bf537-stamp - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf538f-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf548-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf561-acvilon - Valentin Yakovenkov <yakovenkov(a)niistt.ru> +Active blackfin - - - - bf561-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - bf609-ezkit - Sonic Zhang <sonic.adi(a)gmail.com> +Active blackfin - - - - blackstamp - Wojtek Skulski <skulski(a)pas.rochester.edu>:Wojtek Skulski <info(a)skutek.com>:Benjamin Matthews <mben12(a)gmail.com> +Active blackfin - - - - blackvme - Wojtek Skulski <skulski(a)pas.rochester.edu>:Wojtek Skulski <info(a)skutek.com>:Benjamin Matthews <mben12(a)gmail.com> +Active blackfin - - - - br4 - Dimitar Penev <dpn(a)switchfin.org> +Active blackfin - - - - dnp5370 - M.Hasewinkel (MHA) <info(a)ssv-embedded.de> +Active blackfin - - - - ibf-dsp561 - I-SYST Micromodule <support(a)i-syst.com> +Active blackfin - - - - pr1 - Dimitar Penev <dpn(a)switchfin.org> +Active blackfin - - - bf527-ezkit bf527-ezkit-v2 bf527-ezkit:BF527_EZKIT_REV_2_1 Sonic Zhang <sonic.adi(a)gmail.com> Active m68k mcf5227x - freescale m52277evb M52277EVB M52277EVB:SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000 TsiChung Liew <Tsi-Chung.Liew(a)freescale.com> Active m68k mcf5227x - freescale m52277evb M52277EVB_stmicro M52277EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000 TsiChung Liew <Tsi-Chung.Liew(a)freescale.com> Active m68k mcf523x - freescale m5235evb M5235EVB M5235EVB:SYS_TEXT_BASE=0xFFE00000 TsiChung Liew <Tsi-Chung.Liew(a)freescale.com> @@ -494,7 +494,7 @@ Active m68k mcf547x_8x - freescale m548xevb Active m68k mcf547x_8x - freescale m548xevb M5485FFE M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64 TsiChung Liew <Tsi-Chung.Liew(a)freescale.com> Active m68k mcf547x_8x - freescale m548xevb M5485GFE M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64 TsiChung Liew <Tsi-Chung.Liew(a)freescale.com> Active m68k mcf547x_8x - freescale m548xevb M5485HFE M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO TsiChung Liew <Tsi-Chung.Liew(a)freescale.com> -Active microblaze microblaze - xilinx microblaze-generic microblaze-generic - Michal Simek <monstr(a)monstr.eu> +Active microblaze - - xilinx microblaze-generic microblaze-generic - Michal Simek <monstr(a)monstr.eu> Active mips mips32 - - qemu-mips qemu_mips qemu-mips:SYS_BIG_ENDIAN Vlad Lungu <vlad.lungu(a)windriver.com> Active mips mips32 - - qemu-mips qemu_mipsel qemu-mips:SYS_LITTLE_ENDIAN - Active mips mips32 - imgtec malta malta malta:SYS_BIG_ENDIAN Paul Burton <paul.burton(a)imgtec.com> @@ -522,10 +522,10 @@ Active mips mips64 - - qemu-mips Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes <uboot(a)andestech.com> Active nds32 n1213 ag101 AndesTech adp-ag101p adp-ag101p - Andes <uboot(a)andestech.com> Active nds32 n1213 ag102 AndesTech adp-ag102 adp-ag102 - Andes <uboot(a)andestech.com> -Active nios2 nios2 - altera nios2-generic nios2-generic - Scott McNutt <smcnutt(a)psyent.com> -Active nios2 nios2 - psyent pci5441 PCI5441 - Scott McNutt <smcnutt(a)psyent.com> -Active nios2 nios2 - psyent pk1c20 PK1C20 - Scott McNutt <smcnutt(a)psyent.com> -Active openrisc or1200 - openrisc openrisc-generic openrisc-generic - Stefan Kristiansson <stefan.kristiansson(a)saunalahti.fi> +Active nios2 - - altera nios2-generic nios2-generic - Scott McNutt <smcnutt(a)psyent.com> +Active nios2 - - psyent pci5441 PCI5441 - Scott McNutt <smcnutt(a)psyent.com> +Active nios2 - - psyent pk1c20 PK1C20 - Scott McNutt <smcnutt(a)psyent.com> +Active openrisc - - openrisc openrisc-generic openrisc-generic - Stefan Kristiansson <stefan.kristiansson(a)saunalahti.fi> Active powerpc 74xx_7xx - - - ppmc7xx - - Active powerpc 74xx_7xx - - evb64260 P3G4 - Wolfgang Denk <wd(a)denx.de> Active powerpc 74xx_7xx - eltec elppc ELPPC - - @@ -1148,7 +1148,7 @@ Active powerpc ppc4xx - xilinx ppc405-generic Active powerpc ppc4xx - xilinx ppc405-generic xilinx-ppc405-generic_flash xilinx-ppc405-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC Ricardo Ribalda <ricardo.ribalda(a)uam.es> Active powerpc ppc4xx - xilinx ppc440-generic xilinx-ppc440-generic xilinx-ppc440-generic:SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1 Ricardo Ribalda <ricardo.ribalda(a)uam.es> Active powerpc ppc4xx - xilinx ppc440-generic xilinx-ppc440-generic_flash xilinx-ppc440-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC Ricardo Ribalda <ricardo.ribalda(a)uam.es> -Active sandbox sandbox - - sandbox sandbox - Simon Glass <sjg(a)chromium.org> +Active sandbox - - - sandbox sandbox - Simon Glass <sjg(a)chromium.org> Active sh sh2 - renesas rsk7203 rsk7203 - Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com>:Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Active sh sh2 - renesas rsk7264 rsk7264 - Phil Edworthy <phil.edworthy(a)renesas.com> Active sh sh2 - renesas rsk7269 rsk7269 - - @@ -1176,7 +1176,7 @@ Active sparc leon3 - gaisler - Active sparc leon3 - gaisler - gr_ep2s60 - - Active sparc leon3 - gaisler - gr_xc3s_1500 - - Active sparc leon3 - gaisler - grsim - - -Active x86 x86 coreboot chromebook-x86 coreboot coreboot-x86 coreboot:SYS_TEXT_BASE=0x01110000 Simon Glass <sjg(a)chromium.org> +Active x86 - coreboot chromebook-x86 coreboot coreboot-x86 coreboot:SYS_TEXT_BASE=0x01110000 Simon Glass <sjg(a)chromium.org> # The following were moved to "Orphan" in June, 2014 Orphan arm arm1176 tnetv107x ti tnetv107xevm tnetv107x_evm - Chan-Taek Park <c-park(a)ti.com> Orphan arm arm926ejs at91 calao sbc35_a9g20 sbc35_a9g20_eeprom sbc35_a9g20:AT91SAM9G20,SYS_USE_EEPROM Albin Tonnerre <albin.tonnerre(a)free-electrons.com> @@ -1187,13 +1187,13 @@ Orphan arm arm926ejs at91 calao tny_a9260 Orphan arm arm926ejs at91 calao tny_a9260 tny_a9g20_nandflash tny_a9260:AT91SAM9G20,SYS_USE_NANDFLASH Albin Tonnerre <albin.tonnerre(a)free-electrons.com> Orphan arm armv7 mx6 congatec cgtqmx6eval cgtqmx6qeval cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q Leo Sartre <lsartre(a)adeneo-embedded.com> Orphan arm pxa - - - palmtreo680 - Mike Dunn <mikedunn(a)newsguy.com> -Orphan avr32 at32ap at32ap700x atmel - atngw100 - Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1002 - Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1003 - Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1004 - Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> -Orphan avr32 at32ap at32ap700x atmel atstk1000 atstk1006 - Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> -Orphan avr32 at32ap at32ap700x earthlcd - favr-32-ezkit - Hans-Christian Egtvedt <hans-christian.egtvedt(a)atmel.com> -Orphan blackfin blackfin - - - ip04 - Brent Kandetzki <brentk(a)teleco.com> +Orphan avr32 - at32ap700x atmel - atngw100 - Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> +Orphan avr32 - at32ap700x atmel atstk1000 atstk1002 - Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> +Orphan avr32 - at32ap700x atmel atstk1000 atstk1003 - Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> +Orphan avr32 - at32ap700x atmel atstk1000 atstk1004 - Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> +Orphan avr32 - at32ap700x atmel atstk1000 atstk1006 - Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> +Orphan avr32 - at32ap700x earthlcd - favr-32-ezkit - Hans-Christian Egtvedt <hans-christian.egtvedt(a)atmel.com> +Orphan blackfin - - - - ip04 - Brent Kandetzki <brentk(a)teleco.com> Orphan m68k mcf52x2 - freescale m5253evbe M5253EVBE - Hayden Fraser <Hayden.Fraser(a)freescale.com> Orphan powerpc mpc5xxx - - galaxy5200 galaxy5200 galaxy5200:galaxy5200 Eric Millbrandt <emillbrandt(a)dekaresearch.com> Orphan powerpc mpc5xxx - - galaxy5200 galaxy5200_LOWBOOT galaxy5200:galaxy5200_LOWBOOT Eric Millbrandt <emillbrandt(a)dekaresearch.com> @@ -1224,14 +1224,14 @@ Orphan powerpc mpc824x - - musenki Orphan powerpc mpc824x - - sandpoint Sandpoint8245 - Jim Thompson <jim(a)musenki.com> Orphan powerpc mpc8260 - - - ppmc8260 - Brad Kemp <Brad.Kemp(a)seranoa.com> # The following were moved to "Orphan" in March, 2014 -Orphan blackfin blackfin - - - cm-bf527 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> -Orphan blackfin blackfin - - - cm-bf533 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> -Orphan blackfin blackfin - - - cm-bf537e - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> -Orphan blackfin blackfin - - - cm-bf537u - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> -Orphan blackfin blackfin - - - cm-bf548 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> -Orphan blackfin blackfin - - - cm-bf561 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> -Orphan blackfin blackfin - - - tcm-bf518 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> -Orphan blackfin blackfin - - - tcm-bf537 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> +Orphan blackfin - - - - cm-bf527 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> +Orphan blackfin - - - - cm-bf533 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> +Orphan blackfin - - - - cm-bf537e - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> +Orphan blackfin - - - - cm-bf537u - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> +Orphan blackfin - - - - cm-bf548 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> +Orphan blackfin - - - - cm-bf561 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> +Orphan blackfin - - - - tcm-bf518 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> +Orphan blackfin - - - - tcm-bf537 - Bluetechnix Tinyboards <bluetechnix(a)blackfin.uclinux.org> Orphan powerpc mpc5xxx - matrix_vision mvbc_p MVBC_P MVBC_P:MVBC_P Andre Schwarz <andre.schwarz(a)matrix-vision.de> Orphan powerpc mpc5xxx - matrix_vision mvsmr MVSMR - Andre Schwarz <andre.schwarz(a)matrix-vision.de> Orphan powerpc mpc83xx - freescale mpc8360erdk MPC8360ERDK - Anton Vorontsov <avorontsov(a)ru.mvista.com> diff --git a/config.mk b/config.mk index 05864aa..bd74732 100644 --- a/config.mk +++ b/config.mk @@ -24,10 +24,7 @@ OBJCOPYFLAGS := # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files. # Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains # CPU-specific code. -CPUDIR=arch/$(ARCH)/cpu/$(CPU) -ifneq ($(srctree)/$(CPUDIR),$(wildcard $(srctree)/$(CPUDIR))) -CPUDIR=arch/$(ARCH)/cpu -endif +CPUDIR=arch/$(ARCH)/cpu$(if $(CPU),/$(CPU),) sinclude $(srctree)/arch/$(ARCH)/config.mk # include architecture dependend rules sinclude $(srctree)/$(CPUDIR)/config.mk # include CPU specific rules diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c index fe5c9e9..5599bb9 100644 --- a/drivers/sound/sandbox.c +++ b/drivers/sound/sandbox.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <asm/arch/sound.h> +#include <asm/sound.h> #include <asm/sdl.h> int sound_play(uint32_t msec, uint32_t frequency) diff --git a/mkconfig b/mkconfig index 2bf5897..401f262 100755 --- a/mkconfig +++ b/mkconfig @@ -55,6 +55,11 @@ CONFIG_NAME="${7%_config}" arch="$2" cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $1}'` spl_cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $2}'` + +if [ "$cpu" = "-" ] ; then + cpu= +fi + if [ "$6" = "<none>" ] ; then board= elif [ "$6" = "-" ] ; then @@ -114,10 +119,10 @@ fi rm -f asm/arch -if [ -z "${soc}" ] ; then - ln -s ${LNPREFIX}arch-${cpu} asm/arch -else +if [ "${soc}" ] ; then ln -s ${LNPREFIX}arch-${soc} asm/arch +elif [ "${cpu}" ] ; then + ln -s ${LNPREFIX}arch-${cpu} asm/arch fi if [ -z "$KBUILD_SRC" ] ; then -- 1.9.1

3 3