diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-04 19:41:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-04 19:41:30 -0400 |
| commit | 0cba6e906a5a94b68dc4b42dc5e9bca8e77798f7 (patch) | |
| tree | f5160ba496f6e75862800726c989a616f5551547 /board | |
| parent | d64caaf77dec2f0a576d0d1f7c7f4f463ebc7de8 (diff) | |
| parent | 89a897fc4d78e31332e5899e977d8bf3c82abafa (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/MAINTAINERS | 10 | ||||
| -rw-r--r-- | board/sunxi/board.c | 7 | ||||
| -rwxr-xr-x | board/sunxi/mksunxi_fit_atf.sh | 10 |
3 files changed, 25 insertions, 2 deletions
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index db51f48ab60..2f959764451 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -330,6 +330,11 @@ S: Maintained F: configs/A20-Olimex-SOM204-EVB_defconfig F: configs/A20-Olimex-SOM204-EVB-eMMC_defconfig +ORANGEPI ONE PLUS BOARD +M: Jagan Teki <jagan@amarulasolutions.com> +S: Maintained +F: configs/orangepi_one_plus_defconfig + ORANGEPI WIN/WIN PLUS BOARD M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained @@ -370,6 +375,11 @@ M: Andre Przywara <andre.przywara@arm.com> S: Maintained F: configs/pine64_plus_defconfig +PINE H64 BOARD +M: Icenowy Zheng <icenowy@aosc.io> +S: Maintained +F: configs/pine_h64_defconfig + R16 EVB PARROT BOARD M: Quentin Schulz <quentin.schulz@free-electrons.com> S: Maintained diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 5ed1b8bae18..857d5ff0103 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -443,6 +443,13 @@ static void mmc_pinmux_setup(int sdc) sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP); sunxi_gpio_set_drv(pin, 2); } +#elif defined(CONFIG_MACH_SUN50I_H6) + /* SDC2: PC4-PC14 */ + for (pin = SUNXI_GPC(4); pin <= SUNXI_GPC(14); pin++) { + sunxi_gpio_set_cfgpin(pin, SUNXI_GPC_SDC2); + sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP); + sunxi_gpio_set_drv(pin, 2); + } #elif defined(CONFIG_MACH_SUN9I) /* SDC2: PC6-PC16 */ for (pin = SUNXI_GPC(6); pin <= SUNXI_GPC(16); pin++) { diff --git a/board/sunxi/mksunxi_fit_atf.sh b/board/sunxi/mksunxi_fit_atf.sh index 36abe9efed4..88ad7197470 100755 --- a/board/sunxi/mksunxi_fit_atf.sh +++ b/board/sunxi/mksunxi_fit_atf.sh @@ -13,6 +13,12 @@ if [ ! -f $BL31 ]; then BL31=/dev/null fi +if grep -q "^CONFIG_MACH_SUN50I_H6=y" .config; then + BL31_ADDR=0x104000 +else + BL31_ADDR=0x44000 +fi + cat << __HEADER_EOF /dts-v1/; @@ -35,8 +41,8 @@ cat << __HEADER_EOF type = "firmware"; arch = "arm64"; compression = "none"; - load = <0x44000>; - entry = <0x44000>; + load = <$BL31_ADDR>; + entry = <$BL31_ADDR>; }; __HEADER_EOF |