June 2017 - U-Boot

[U-Boot] [PATCH 0/4] arm: am57xx: cl-som-am57x: 2'nd stage
by Uri Mashiach 06 Jun '17

06 Jun '17

Various commits related to the CL-SOM-AM57x module. Uri Mashiach (4): arm: am57xx: cl-som-am57x: support for FS boot arm: am57xx: cl-som-am57x: change the shell prompt ARM: am57xx: cl-som-am57x: support for AM5718 arm: am57xx: cl-som-am57x: adjust default env to the installation system board/compulab/cl-som-am57x/spl.c | 5 +++++ configs/cl-som-am57x_defconfig | 2 ++ include/configs/cl-som-am57x.h | 12 +++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) -- 2.7.4

2 12

[U-Boot] [PATCH v2 25/38] arm: Add explicit include of <asm/mach-types.h>
by Simon Glass 06 Jun '17

06 Jun '17

Rather than relying on common.h to provide this include, which is going away at some point, include it explicitly in each file. Signed-off-by: Simon Glass <sjg(a)chromium.org> Reviewed-by: Tom Rini <trini(a)konsulko.com> --- Changes in v2: - Drop #ifdef guard in arch/arm/lib/spl.c arch/arm/lib/spl.c | 1 + board/Barix/ipam390/ipam390.c | 1 + board/LaCie/edminiv2/edminiv2.c | 1 + board/LaCie/net2big_v2/net2big_v2.c | 1 + board/LaCie/netspace_v2/netspace_v2.c | 1 + board/Marvell/aspenite/aspenite.c | 1 + board/Marvell/gplugd/gplugd.c | 1 + board/Marvell/guruplug/guruplug.c | 1 + board/Marvell/openrd/openrd.c | 1 + board/Marvell/sheevaplug/sheevaplug.c | 1 + board/Seagate/dockstar/dockstar.c | 1 + board/Seagate/goflexhome/goflexhome.c | 1 + board/Seagate/nas220/nas220.c | 1 + board/amazon/kc1/kc1.c | 1 + board/armltd/integrator/integrator.c | 1 + board/armltd/vexpress/vexpress_common.c | 1 + board/atmel/at91rm9200ek/at91rm9200ek.c | 1 + board/atmel/at91sam9261ek/at91sam9261ek.c | 1 + board/atmel/at91sam9263ek/at91sam9263ek.c | 1 + board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 1 + board/atmel/at91sam9rlek/at91sam9rlek.c | 1 + board/atmel/at91sam9x5ek/at91sam9x5ek.c | 1 + board/bluewater/gurnard/gurnard.c | 1 + board/bluewater/snapper9260/snapper9260.c | 1 + board/cirrus/edb93xx/edb93xx.c | 1 + board/davinci/da8xxevm/da850evm.c | 1 + board/davinci/da8xxevm/omapl138_lcdk.c | 1 + board/davinci/ea20/ea20.c | 1 + board/esd/meesc/meesc.c | 1 + board/freescale/mx35pdk/mx35pdk.c | 1 + board/gumstix/duovero/duovero.c | 1 + board/h2200/h2200.c | 1 + board/imx31_phycore/imx31_phycore.c | 1 + board/lego/ev3/legoev3.c | 1 + board/mini-box/picosam9g45/picosam9g45.c | 1 + board/nvidia/seaboard/seaboard.c | 1 + board/overo/common.c | 1 + board/ronetix/pm9261/pm9261.c | 1 + board/ronetix/pm9263/pm9263.c | 1 + board/ronetix/pm9g45/pm9g45.c | 1 + board/samsung/goni/goni.c | 1 + board/samsung/smdkc100/smdkc100.c | 1 + board/samsung/universal_c210/universal.c | 1 + board/siemens/common/board.c | 1 + board/spear/spear300/spear300.c | 1 + board/spear/spear310/spear310.c | 1 + board/spear/spear320/spear320.c | 1 + board/spear/spear600/spear600.c | 1 + board/spear/x600/x600.c | 1 + board/ti/omap5_uevm/evm.c | 1 + board/ti/panda/panda.c | 1 + board/toradex/colibri_pxa270/colibri_pxa270.c | 1 + board/toradex/common/tdx-cfg-block.c | 1 + board/zipitz2/zipitz2.c | 1 + drivers/usb/host/ehci-mx6.c | 1 + 55 files changed, 55 insertions(+) diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index 8ff2c5065d..27d6682c0b 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -12,6 +12,7 @@ #include <spl.h> #include <image.h> #include <linux/compiler.h> +#include <asm/mach-types.h> #ifndef CONFIG_SPL_DM /* Pointer to as well as the global data structure for SPL */ diff --git a/board/Barix/ipam390/ipam390.c b/board/Barix/ipam390/ipam390.c index fd1965d9f5..3a584021ac 100644 --- a/board/Barix/ipam390/ipam390.c +++ b/board/Barix/ipam390/ipam390.c @@ -29,6 +29,7 @@ #include <asm/gpio.h> #include <hwconfig.h> #include <bootstage.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c index edf6281797..736d65caa1 100644 --- a/board/LaCie/edminiv2/edminiv2.c +++ b/board/LaCie/edminiv2/edminiv2.c @@ -14,6 +14,7 @@ #include "../common/common.h" #include <spl.h> #include <ns16550.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c index 263bb5426c..2e6e9ef916 100644 --- a/board/LaCie/net2big_v2/net2big_v2.c +++ b/board/LaCie/net2big_v2/net2big_v2.c @@ -12,6 +12,7 @@ #include <common.h> #include <command.h> #include <i2c.h> +#include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c index 17e629622f..16d694716f 100644 --- a/board/LaCie/netspace_v2/netspace_v2.c +++ b/board/LaCie/netspace_v2/netspace_v2.c @@ -11,6 +11,7 @@ #include <common.h> #include <command.h> +#include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c index 24ee6791a6..0ef63b7b7c 100644 --- a/board/Marvell/aspenite/aspenite.c +++ b/board/Marvell/aspenite/aspenite.c @@ -9,6 +9,7 @@ #include <common.h> #include <mvmfp.h> +#include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/mfp.h> #include <asm/arch/armada100.h> diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c index 16040e19d7..05ce98bb61 100644 --- a/board/Marvell/gplugd/gplugd.c +++ b/board/Marvell/gplugd/gplugd.c @@ -19,6 +19,7 @@ #include <asm/arch/armada100.h> #include <asm/gpio.h> #include <miiphy.h> +#include <asm/mach-types.h> #ifdef CONFIG_ARMADA100_FEC #include <net.h> diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c index b0d5f1e10f..af0c491632 100644 --- a/board/Marvell/guruplug/guruplug.c +++ b/board/Marvell/guruplug/guruplug.c @@ -8,6 +8,7 @@ #include <common.h> #include <miiphy.h> +#include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index 17a65600e4..f6cffc8cbb 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -13,6 +13,7 @@ #include <common.h> #include <miiphy.h> +#include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c index 8907fb58ff..c7dfaa276c 100644 --- a/board/Marvell/sheevaplug/sheevaplug.c +++ b/board/Marvell/sheevaplug/sheevaplug.c @@ -8,6 +8,7 @@ #include <common.h> #include <miiphy.h> +#include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c index 83ab1bc32d..f444c1628d 100644 --- a/board/Seagate/dockstar/dockstar.c +++ b/board/Seagate/dockstar/dockstar.c @@ -15,6 +15,7 @@ #include <asm/arch/mpp.h> #include <asm/arch/cpu.h> #include <asm/io.h> +#include <asm/mach-types.h> #include "dockstar.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c index 1f4fb92494..5d0a4242a8 100644 --- a/board/Seagate/goflexhome/goflexhome.c +++ b/board/Seagate/goflexhome/goflexhome.c @@ -14,6 +14,7 @@ #include <common.h> #include <miiphy.h> +#include <asm/mach-types.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> #include <asm/arch/cpu.h> diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c index c5349b900e..18c2895993 100644 --- a/board/Seagate/nas220/nas220.c +++ b/board/Seagate/nas220/nas220.c @@ -11,6 +11,7 @@ #include <common.h> #include <miiphy.h> +#include <asm/mach-types.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> #include <asm/arch/cpu.h> diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c index b3fa7896c5..13a9c6a0fe 100644 --- a/board/amazon/kc1/kc1.c +++ b/board/amazon/kc1/kc1.c @@ -17,6 +17,7 @@ #include <asm/emif.h> #include <twl6030.h> #include "kc1.h" +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index cbe706170d..301f83efc9 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -24,6 +24,7 @@ #include <dm/platform_data/serial_pl01x.h> #include "arm-ebi.h" #include "integrator-sc.h" +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c index 458f1d8148..89ab8f7a59 100644 --- a/board/armltd/vexpress/vexpress_common.c +++ b/board/armltd/vexpress/vexpress_common.c @@ -21,6 +21,7 @@ #include <errno.h> #include <netdev.h> #include <asm/io.h> +#include <asm/mach-types.h> #include <asm/arch/systimer.h> #include <asm/arch/sysctrl.h> #include <asm/arch/wdt.h> diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c index 98d76a6fa7..36f147b44d 100644 --- a/board/atmel/at91rm9200ek/at91rm9200ek.c +++ b/board/atmel/at91rm9200ek/at91rm9200ek.c @@ -12,6 +12,7 @@ #include <common.h> #include <netdev.h> +#include <asm/mach-types.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_pio.h> #include <asm/arch/at91_common.h> diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c index 6398bcbc9e..b4acb742b3 100644 --- a/board/atmel/at91sam9261ek/at91sam9261ek.c +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c @@ -21,6 +21,7 @@ #include <net.h> #include <netdev.h> #endif +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index 3de978311d..b37e9d3c7a 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -20,6 +20,7 @@ #include <asm/arch/hardware.h> #include <lcd.h> #include <atmel_lcdc.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c index d3bc5c69d4..8e377593ef 100644 --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c @@ -18,6 +18,7 @@ #include <lcd.h> #include <linux/mtd/nand.h> #include <atmel_lcdc.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c index 0b603ed13a..7966269ff3 100644 --- a/board/atmel/at91sam9rlek/at91sam9rlek.c +++ b/board/atmel/at91sam9rlek/at91sam9rlek.c @@ -9,6 +9,7 @@ #include <common.h> #include <debug_uart.h> #include <asm/io.h> +#include <asm/mach-types.h> #include <asm/arch/at91sam9rl.h> #include <asm/arch/at91sam9rl_matrix.h> #include <asm/arch/at91sam9_smc.h> diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c index 81c2aad1a5..1e4a4a2acf 100644 --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c @@ -19,6 +19,7 @@ #include <nand.h> #include <version.h> #endif +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c index 08b1401372..e82c691841 100644 --- a/board/bluewater/gurnard/gurnard.c +++ b/board/bluewater/gurnard/gurnard.c @@ -21,6 +21,7 @@ #include <spi.h> #include <asm/gpio.h> #include <asm/io.h> +#include <asm/mach-types.h> #include <asm/arch/at91sam9g45_matrix.h> #include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91_common.h> diff --git a/board/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c index 2d1a89e102..7e9da4e7b7 100644 --- a/board/bluewater/snapper9260/snapper9260.c +++ b/board/bluewater/snapper9260/snapper9260.c @@ -12,6 +12,7 @@ #include <dm.h> #include <asm/io.h> #include <asm/gpio.h> +#include <asm/mach-types.h> #include <asm/arch/at91sam9260_matrix.h> #include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91_common.h> diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c index 720b490f2b..02e2896fa7 100644 --- a/board/cirrus/edb93xx/edb93xx.c +++ b/board/cirrus/edb93xx/edb93xx.c @@ -18,6 +18,7 @@ #include <common.h> #include <netdev.h> #include <asm/io.h> +#include <asm/mach-types.h> #include <asm/arch/ep93xx.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index 9e17eb865d..11ea52f240 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -23,6 +23,7 @@ #include <asm/arch/davinci_misc.h> #include <linux/errno.h> #include <hwconfig.h> +#include <asm/mach-types.h> #ifdef CONFIG_MMC_DAVINCI #include <mmc.h> diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index d941285977..52bb7363a7 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -19,6 +19,7 @@ #include <asm/ti-common/davinci_nand.h> #include <asm/io.h> #include <linux/errno.h> +#include <asm/mach-types.h> #include <asm/arch/davinci_misc.h> #ifdef CONFIG_MMC_DAVINCI #include <mmc.h> diff --git a/board/davinci/ea20/ea20.c b/board/davinci/ea20/ea20.c index 6edfa17a91..2a187f1900 100644 --- a/board/davinci/ea20/ea20.c +++ b/board/davinci/ea20/ea20.c @@ -18,6 +18,7 @@ #include <i2c.h> #include <net.h> #include <netdev.h> +#include <asm/mach-types.h> #include <asm/arch/hardware.h> #include <asm/ti-common/davinci_nand.h> #include <asm/arch/emac_defs.h> diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c index 19b673e6d2..037cf074ea 100644 --- a/board/esd/meesc/meesc.c +++ b/board/esd/meesc/meesc.c @@ -13,6 +13,7 @@ #include <common.h> #include <asm/io.h> #include <asm/gpio.h> +#include <asm/mach-types.h> #include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c index 123fb11f42..ea0bd8f30a 100644 --- a/board/freescale/mx35pdk/mx35pdk.c +++ b/board/freescale/mx35pdk/mx35pdk.c @@ -24,6 +24,7 @@ #include <asm/gpio.h> #include <asm/arch/sys_proto.h> #include <netdev.h> +#include <asm/mach-types.h> #ifndef CONFIG_BOARD_LATE_INIT #error "CONFIG_BOARD_LATE_INIT must be set for this board" diff --git a/board/gumstix/duovero/duovero.c b/board/gumstix/duovero/duovero.c index fefcde87ae..849224efda 100644 --- a/board/gumstix/duovero/duovero.c +++ b/board/gumstix/duovero/duovero.c @@ -14,6 +14,7 @@ #include <asm/arch/clock.h> #include <asm/arch/gpio.h> #include <asm/gpio.h> +#include <asm/mach-types.h> #include "duovero_mux_data.h" diff --git a/board/h2200/h2200.c b/board/h2200/h2200.c index 01f8e67be1..2a2b7979f1 100644 --- a/board/h2200/h2200.c +++ b/board/h2200/h2200.c @@ -11,6 +11,7 @@ #include <asm/arch/pxa-regs.h> #include <asm/io.h> #include <usb.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/imx31_phycore/imx31_phycore.c b/board/imx31_phycore/imx31_phycore.c index 3f45e4e4b8..653246615f 100644 --- a/board/imx31_phycore/imx31_phycore.c +++ b/board/imx31_phycore/imx31_phycore.c @@ -11,6 +11,7 @@ #include <netdev.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> +#include <asm/mach-types.h> #include <asm/arch/sys_proto.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c index 0ad33eaeae..3d6de11798 100644 --- a/board/lego/ev3/legoev3.c +++ b/board/lego/ev3/legoev3.c @@ -25,6 +25,7 @@ #include <asm/arch/davinci_misc.h> #include <linux/errno.h> #include <hwconfig.h> +#include <asm/mach-types.h> #ifdef CONFIG_MMC_DAVINCI #include <mmc.h> diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c index 5eb2ad77ca..09ec247663 100644 --- a/board/mini-box/picosam9g45/picosam9g45.c +++ b/board/mini-box/picosam9g45/picosam9g45.c @@ -27,6 +27,7 @@ #include <net.h> #endif #include <netdev.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c index b56bc529d1..0d5eec9dd8 100644 --- a/board/nvidia/seaboard/seaboard.c +++ b/board/nvidia/seaboard/seaboard.c @@ -7,6 +7,7 @@ #include <common.h> #include <asm/io.h> +#include <asm/mach-types.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/board.h> #include <asm/arch/clock.h> diff --git a/board/overo/common.c b/board/overo/common.c index f6f6792d09..5656e2d17f 100644 --- a/board/overo/common.c +++ b/board/overo/common.c @@ -18,6 +18,7 @@ #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index 79073d8aaa..f60dddac7b 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -26,6 +26,7 @@ #include <net.h> #endif #include <netdev.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c index accf16f151..1469136295 100644 --- a/board/ronetix/pm9263/pm9263.c +++ b/board/ronetix/pm9263/pm9263.c @@ -25,6 +25,7 @@ #include <net.h> #endif #include <netdev.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c index c1225800a9..e2620e3c04 100644 --- a/board/ronetix/pm9g45/pm9g45.c +++ b/board/ronetix/pm9g45/pm9g45.c @@ -25,6 +25,7 @@ #include <net.h> #endif #include <netdev.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index 12593830e9..d0247ac257 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -17,6 +17,7 @@ #include <samsung/misc.h> #include <usb.h> #include <usb_mass_storage.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c index 79e127d99a..5d23844458 100644 --- a/board/samsung/smdkc100/smdkc100.c +++ b/board/samsung/smdkc100/smdkc100.c @@ -11,6 +11,7 @@ #include <asm/io.h> #include <asm/arch/sromc.h> #include <netdev.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index feb8a341be..cc6eaf7ad0 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -23,6 +23,7 @@ #include <libtizen.h> #include <samsung/misc.h> #include <usb_mass_storage.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c index 9cafcea53a..b967227411 100644 --- a/board/siemens/common/board.c +++ b/board/siemens/common/board.c @@ -28,6 +28,7 @@ #include <miiphy.h> #include <cpsw.h> #include <watchdog.h> +#include <asm/mach-types.h> #include "../common/factoryset.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c index 396b5bdf60..8f8132a31a 100644 --- a/board/spear/spear300/spear300.c +++ b/board/spear/spear300/spear300.c @@ -11,6 +11,7 @@ #include <nand.h> #include <asm/io.h> #include <linux/mtd/fsmc_nand.h> +#include <asm/mach-types.h> #include <asm/arch/hardware.h> #include <asm/arch/spr_defs.h> #include <asm/arch/spr_misc.h> diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c index 6f39ef1b40..d07dda34e9 100644 --- a/board/spear/spear310/spear310.c +++ b/board/spear/spear310/spear310.c @@ -12,6 +12,7 @@ #include <nand.h> #include <asm/io.h> #include <linux/mtd/fsmc_nand.h> +#include <asm/mach-types.h> #include <asm/arch/hardware.h> #include <asm/arch/spr_defs.h> #include <asm/arch/spr_misc.h> diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c index 52196afd17..66073f3715 100644 --- a/board/spear/spear320/spear320.c +++ b/board/spear/spear320/spear320.c @@ -12,6 +12,7 @@ #include <nand.h> #include <asm/io.h> #include <linux/mtd/fsmc_nand.h> +#include <asm/mach-types.h> #include <asm/arch/hardware.h> #include <asm/arch/spr_defs.h> #include <asm/arch/spr_misc.h> diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c index 858a9cae76..2a54b8b323 100644 --- a/board/spear/spear600/spear600.c +++ b/board/spear/spear600/spear600.c @@ -11,6 +11,7 @@ #include <nand.h> #include <asm/io.h> #include <linux/mtd/fsmc_nand.h> +#include <asm/mach-types.h> #include <asm/arch/hardware.h> #include <asm/arch/spr_defs.h> #include <asm/arch/spr_misc.h> diff --git a/board/spear/x600/x600.c b/board/spear/x600/x600.c index f8e9fddb0f..2c34ea1ad1 100644 --- a/board/spear/x600/x600.c +++ b/board/spear/x600/x600.c @@ -14,6 +14,7 @@ #include <phy.h> #include <rtc.h> #include <asm/io.h> +#include <asm/mach-types.h> #include <asm/arch/hardware.h> #include <asm/arch/spr_defs.h> #include <asm/arch/spr_misc.h> diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index b6cc417333..4b25cc2d7c 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -24,6 +24,7 @@ #include <sata.h> #include <usb.h> #include <asm/gpio.h> +#include <asm/mach-types.h> #include <asm/arch/clock.h> #include <asm/arch/ehci.h> #include <asm/ehci-omap.h> diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index 72aabb242c..6ffb53c4c6 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -6,6 +6,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> +#include <asm/mach-types.h> #include <asm/arch/sys_proto.h> #include <asm/arch/mmc_host_def.h> #include <asm/arch/clock.h> diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c index 8e948545e3..ddcc837bb0 100644 --- a/board/toradex/colibri_pxa270/colibri_pxa270.c +++ b/board/toradex/colibri_pxa270/colibri_pxa270.c @@ -18,6 +18,7 @@ #include <netdev.h> #include <serial.h> #include <usb.h> +#include <asm/mach-types.h> #include "../common/tdx-common.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 0014ce80a1..9e2af917fa 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -23,6 +23,7 @@ #include <malloc.h> #include <mmc.h> #include <nand.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/zipitz2/zipitz2.c b/board/zipitz2/zipitz2.c index e81d6ff18d..8a15c30c0b 100644 --- a/board/zipitz2/zipitz2.c +++ b/board/zipitz2/zipitz2.c @@ -16,6 +16,7 @@ #include <spi.h> #include <asm/io.h> #include <usb.h> +#include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 55ac162a3c..2f5315b0a6 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -17,6 +17,7 @@ #include <asm/imx-common/iomux-v3.h> #include <asm/imx-common/sys_proto.h> #include <dm.h> +#include <asm/mach-types.h> #include <power/regulator.h> #include "ehci.h" -- 2.13.0.219.gdb65acc882-goog

2 1

[U-Boot] [PATCH 1/7] armv7: Mark the default lowlevel_init function as weak
by Tom Rini 06 Jun '17

06 Jun '17

Rather than have a long and if check in the Makefile, mark the default lowlevel_init function as weak (as we do on armv8) so that SoCs can override it if needed, and it will still be discarded if unused. Provide a weak s_init as well to allow for this to link and be discarded. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/cpu/armv7/Makefile | 2 -- arch/arm/cpu/armv7/lowlevel_init.S | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 5fac252c0e00..45dd3caec6b3 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -12,11 +12,9 @@ obj-y += cache_v7.o cache_v7_asm.o obj-y += cpu.o cp15.o obj-y += syslib.o -ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_MX7)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_ARCH_SUNXI)$(CONFIG_ARCH_SOCFPGA)$(CONFIG_ARCH_MX7ULP)$(CONFIG_ARCH_LS1021A),) ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y) obj-y += lowlevel_init.o endif -endif obj-$(CONFIG_ARM_SMCCC) += smccc-call.o obj-$(CONFIG_ARMV7_NONSEC) += nonsec_virt.o virt-v7.o virt-dt.o diff --git a/arch/arm/cpu/armv7/lowlevel_init.S b/arch/arm/cpu/armv7/lowlevel_init.S index 658934d664a4..64f105864f87 100644 --- a/arch/arm/cpu/armv7/lowlevel_init.S +++ b/arch/arm/cpu/armv7/lowlevel_init.S @@ -15,7 +15,14 @@ #include <config.h> #include <linux/linkage.h> -ENTRY(lowlevel_init) +.pushsection .text.s_init, "ax" +WEAK(s_init) + bx lr +ENDPROC(s_init) +.popsection + +.pushsection .text.lowlevel_init, "ax" +WEAK(lowlevel_init) /* * Setup a temporary stack. Global data is not available yet. */ @@ -61,3 +68,4 @@ ENTRY(lowlevel_init) bl s_init pop {ip, pc} ENDPROC(lowlevel_init) +.popsection -- 1.9.1

1 13

[U-Boot] [PATCH] configs: davinci: omapl138_lcdk: add random eth address support
by Suman Anna 06 Jun '17

06 Jun '17

Any TFTP or DHCP boot on the Davinci OMAP-L138 LCDK board requires that the 'ethaddr' variable be defined. There are no e-fuses to store the ethernet mac address for this platform, and neither is a MAC address reserved in any format. So enable random MAC address support so that networking boot can be supported. Signed-off-by: Suman Anna <s-anna(a)ti.com> --- configs/omapl138_lcdk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 0629f9636fd4..23fe084e5476 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -21,6 +21,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000 CONFIG_SPI_FLASH=y -- 2.12.0

3 4

[U-Boot] [PATCH] Enable PXE boot on meson-gxbb.
by Vagrant Cascadian 06 Jun '17

06 Jun '17

Enable distro_bootcmd PXE functions on meson-gxbb systems. Signed-off-by: Vagrant Cascadian <vagrant(a)debian.org> --- include/configs/meson-gxbb-common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index fab2e67117..e109288bcd 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -42,6 +42,7 @@ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ + func(PXE, pxe, na) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -- 2.11.0

3 2

[U-Boot] [PATCH 1/4] rockchip: arm64: rk3399: revise timeout-handling for DRAM PHY lock
by Philipp Tomsich 05 Jun '17

05 Jun '17

Revise the loop watching for a timeout on obtaining a DRAM PHY lock to clearly state a timeout in milliseconds and use get_timer (based on the ARMv8 architected timer) to detect a timeout. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- arch/arm/mach-rockchip/rk3399/sdram_rk3399.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c b/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c index 216a26c..4dd84e2 100644 --- a/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c @@ -5,6 +5,7 @@ * * Adapted from coreboot. */ + #include <common.h> #include <clk.h> #include <dm.h> @@ -19,6 +20,7 @@ #include <asm/arch/grf_rk3399.h> #include <asm/arch/hardware.h> #include <linux/err.h> +#include <time.h> DECLARE_GLOBAL_DATA_PTR; struct chan_info { @@ -506,6 +508,7 @@ static int pctl_cfg(const struct chan_info *chan, u32 channel, u32 tmp, tmp1, tmp2; u32 pwrup_srefresh_exit; int ret; + const ulong timeout_ms = 200; /* * work around controller bug: @@ -588,13 +591,15 @@ static int pctl_cfg(const struct chan_info *chan, u32 channel, clrsetbits_le32(&denali_phy[957], 0x3 << 24, 0x2 << 24); /* Wating for PHY and DRAM init complete */ - tmp = 0; - while (!(readl(&denali_ctl[203]) & (1 << 3))) { - mdelay(10); - tmp++; - if (tmp > 10) + tmp = get_timer(0); + do { + if (get_timer(tmp) > timeout_ms) { + error("DRAM (%s): phy failed to lock within %ld ms\n", + __func__, timeout_ms); return -ETIME; - } + } + } while (!(readl(&denali_ctl[203]) & (1 << 3))); + debug("DRAM (%s): phy locked after %ld ms\n", __func__, get_timer(tmp)); clrsetbits_le32(&denali_ctl[68], PWRUP_SREFRESH_EXIT, pwrup_srefresh_exit); -- 1.9.1

4 13

[U-Boot] [PATCH 1/3] MAINTAINERS, git-mailrc: update maintainer for Rockchip
by Kever Yang 05 Jun '17

05 Jun '17

Send patch to Kever Yang instead of Lin Huang for Rockchip patches, for Lin is not always working on upstream U-Boot. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- doc/git-mailrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index b9b5929..33317d1 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -77,7 +77,7 @@ alias tegra2 tegra alias ti uboot, trini alias uniphier uboot, masahiro alias zynq uboot, monstr -alias rockchip uboot, sjg, Lin huang <hl(a)rock-chips.com> +alias rockchip uboot, sjg, Kever Yang <kever.yang(a)rock-chips.com> alias avr32 uboot, abiessmann alias bfin uboot, vapier, sonic -- 1.9.1

3 7

[U-Boot] [PATCH v3 0/3] rockchip: mkimage: refactor rksd/rkspi padding calculation and add dumpimage support
by Philipp Tomsich 05 Jun '17

05 Jun '17

We support booting both from SD/MMC images and SPI images on the RK3399-Q7 for different use-cases (e.g. external boot in development from the SD card, internal boot from MMC or SPI depending on whether the SPI flash is populated on any given configuration option). In getting the SPI image support ready for production, we found a few areas that warranted improvements: - we had broken SPI bootstrap earlier in the changes introducting boot0-style images for the RK3399 (this needed fixing) - in fixing the broken SPI padding calculation, it became apparent that it's best to refactor and document things before we make the same mistake again in the future - with both SD/MMC and SPI images being used for various purposes by various people, the wrong image style was inadvertendly used in some tests... so we support for 'dumpimage' (i.e. verify_header and print_header) had to be added to quickly check the image type being handled With v3, we pad the images to 2KB again, as this is required by the BootROM (see https://lists.denx.de/pipermail/u-boot/2017-May/293268.html). Changes in v3: - (added patch) forces the alignment/padding to 2KB for SD images, as this would otherwise break the back-to-bootrom functionality - added in v3 Changes in v2: - (in rkcommon_verify_header): changed to use a standard error (i.e. from errno.h) to convey 'header0 signature does not match' [squash of: "rockchip: mkimage: don't mix standard errors and FDT"] Philipp Tomsich (3): rockchip: mkimage: add support for verify_header/print_header rockchip: mkimage: force 2KB alignment for init_size rockchip: mkimage: set init_boot_size to avoid confusing the boot ROM tools/rkcommon.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- tools/rkcommon.h | 20 +++++++++ tools/rksd.c | 35 ++++----------- tools/rkspi.c | 23 ++-------- 4 files changed, 158 insertions(+), 50 deletions(-) -- 1.9.1

4 9

[U-Boot] [PATCH 0/5] Add basic support for Rockchip RV1108 SOC
by Andy Yan 05 Jun '17

05 Jun '17

RV1108 is embedded with an ARM Cortex-A7 single core and a DSP core from Rockchip. It is designed for varies application scenario such as car DVR, sports DV, secure camera and UAV camera. This patchset adds basic support for it to boot an evb board to u-boot console. Other functions such as Ethernet / SFC (SPI Flash controller) will be added later by other people. Andy Yan (5): rockchip: mkimage: Add support for RV1108 rockchip: pinctrl: Add rv1108 pinctrl driver rockchip: clk: Add rv1108 clock driver rockchip: Add core Soc start-up code for rv1108 rockchip: Add basic support for evb-rv1108 board arch/arm/dts/Makefile | 3 +- arch/arm/dts/rv1108-evb.dts | 54 +++ arch/arm/dts/rv1108.dtsi | 479 ++++++++++++++++++++++ arch/arm/include/asm/arch-rockchip/cru_rv1108.h | 111 ++++++ arch/arm/include/asm/arch-rockchip/grf_rv1108.h | 509 ++++++++++++++++++++++++ arch/arm/include/asm/arch-rockchip/periph.h | 1 + arch/arm/mach-rockchip/Kconfig | 8 + arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/rv1108/Kconfig | 28 ++ arch/arm/mach-rockchip/rv1108/Makefile | 11 + arch/arm/mach-rockchip/rv1108/clk_rv1108.c | 32 ++ arch/arm/mach-rockchip/rv1108/rv1108.c | 15 + arch/arm/mach-rockchip/rv1108/syscon_rv1108.c | 21 + board/rockchip/evb_rv1108/Kconfig | 15 + board/rockchip/evb_rv1108/MAINTAINERS | 6 + board/rockchip/evb_rv1108/Makefile | 7 + board/rockchip/evb_rv1108/README | 47 +++ board/rockchip/evb_rv1108/evb_rv1108.c | 52 +++ configs/evb-rv1108_defconfig | 40 ++ drivers/clk/rockchip/Makefile | 1 + drivers/clk/rockchip/clk_rv1108.c | 223 +++++++++++ drivers/pinctrl/Kconfig | 10 + drivers/pinctrl/rockchip/Makefile | 1 + drivers/pinctrl/rockchip/pinctrl_rv1108.c | 184 +++++++++ drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_rv1108.c | 46 +++ include/configs/evb_rv1108.h | 26 ++ include/configs/rv1108_common.h | 33 ++ include/dt-bindings/clock/rv1108-cru.h | 269 +++++++++++++ tools/rkcommon.c | 1 + 30 files changed, 2234 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/rv1108-evb.dts create mode 100644 arch/arm/dts/rv1108.dtsi create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rv1108.h create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rv1108.h create mode 100644 arch/arm/mach-rockchip/rv1108/Kconfig create mode 100644 arch/arm/mach-rockchip/rv1108/Makefile create mode 100644 arch/arm/mach-rockchip/rv1108/clk_rv1108.c create mode 100644 arch/arm/mach-rockchip/rv1108/rv1108.c create mode 100644 arch/arm/mach-rockchip/rv1108/syscon_rv1108.c create mode 100644 board/rockchip/evb_rv1108/Kconfig create mode 100644 board/rockchip/evb_rv1108/MAINTAINERS create mode 100644 board/rockchip/evb_rv1108/Makefile create mode 100644 board/rockchip/evb_rv1108/README create mode 100644 board/rockchip/evb_rv1108/evb_rv1108.c create mode 100644 configs/evb-rv1108_defconfig create mode 100644 drivers/clk/rockchip/clk_rv1108.c create mode 100644 drivers/pinctrl/rockchip/pinctrl_rv1108.c create mode 100644 drivers/sysreset/sysreset_rv1108.c create mode 100644 include/configs/evb_rv1108.h create mode 100644 include/configs/rv1108_common.h create mode 100644 include/dt-bindings/clock/rv1108-cru.h -- 2.7.4

4 16

[U-Boot] [PATCH v2 00/10] rk3328: add support of usb host and gadget
by Meng Dongyang 05 Jun '17

05 Jun '17

Add support of usb host and gadget function for rk3328 and fix bug of dwc2 host driver. Changes in v2: - Add commit messages - Split patch [U-boot,7/8] into two patches - Use fixed regulator to control vbus instead of gpio Meng Dongyang (10): configs: rk3328: add support for usb and config ehci and ohci driver rockchip: dts: rk3328: add ehci and ohci node and enable host0 port configs: rk3328: config xhci controller usb: host: xhci-rockchip: add support for rk3328 rockchip: dts: rk3328: support and enable xhci configs: rk3328: enable dwc2 driver and config for fastboot usb: dwc2: fix macro error and change default config for rk3328 rk3328: board: add support of dwc2 gadget rockchip: dts: rk3328: support and enable dwc2 rockchip: dts: rk3399: control vbus of typec by fixed regulator arch/arm/dts/rk3328-evb.dts | 36 ++++++++++++++++++++++++++++ arch/arm/dts/rk3328.dtsi | 34 +++++++++++++++++++++++++++ arch/arm/dts/rk3399-evb.dts | 16 +++++++++++-- board/rockchip/evb_rk3328/evb-rk3328.c | 43 +++++++++++++++++++++++++++++++--- configs/evb-rk3328_defconfig | 25 ++++++++++++++++++++ drivers/usb/host/dwc2.c | 9 ++++++- drivers/usb/host/dwc2.h | 10 ++++---- drivers/usb/host/xhci-rockchip.c | 31 +++++++++++++++++------- include/configs/rk3328_common.h | 9 +++++++ 9 files changed, 194 insertions(+), 19 deletions(-) -- 1.9.1

3 9