diff options
author | Tom Rini <trini@konsulko.com> | 2023-07-14 03:38:50 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-07-14 03:38:50 +0300 |
commit | c990ecba4d8b73a0fcf6f33d758ff1ed176e44ae (patch) | |
tree | 36ef5b8b83ff5891adbf548dd26b20f3d63a2d4a /board | |
parent | f6da5e927320acd2131d0bb802103aaf34b67925 (diff) | |
parent | 366a863e651edfe976d28995888721e9bd403366 (diff) | |
download | u-boot-c990ecba4d8b73a0fcf6f33d758ff1ed176e44ae.tar.xz |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: Thecus: Misc enhancement and cleanup (Tony)
- mvebu: Add AC5X Allied Telesis x240 board support incl NAND
controller enhancements for this SoC (Chris)
Diffstat (limited to 'board')
-rw-r--r-- | board/alliedtelesis/x240/MAINTAINERS | 7 | ||||
-rw-r--r-- | board/alliedtelesis/x240/Makefile | 6 | ||||
-rw-r--r-- | board/alliedtelesis/x240/x240.c | 13 | ||||
-rw-r--r-- | board/thecus/n2350/n2350.c | 2 |
4 files changed, 27 insertions, 1 deletions
diff --git a/board/alliedtelesis/x240/MAINTAINERS b/board/alliedtelesis/x240/MAINTAINERS new file mode 100644 index 0000000000..f1f78d9616 --- /dev/null +++ b/board/alliedtelesis/x240/MAINTAINERS @@ -0,0 +1,7 @@ +X240 BOARD +M: Chris Packham <chris.packham@alliedtelesis.co.nz> +S: Maintained +F: board/alliedtelesis/x240/ +F: arch/arm/dts/ac5-98dx35xx-rd.dts +F: include/configs/x240.h +F: configs/x240_defconfig diff --git a/board/alliedtelesis/x240/Makefile b/board/alliedtelesis/x240/Makefile new file mode 100644 index 0000000000..7f20a47d6a --- /dev/null +++ b/board/alliedtelesis/x240/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2022 Allied Telesis +# + +obj-y += x240.o diff --git a/board/alliedtelesis/x240/x240.c b/board/alliedtelesis/x240/x240.c new file mode 100644 index 0000000000..0c4f8e03b8 --- /dev/null +++ b/board/alliedtelesis/x240/x240.c @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include <common.h> +#include <asm/global_data.h> + +DECLARE_GLOBAL_DATA_PTR; + +int board_init(void) +{ + gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100; + + return 0; +} diff --git a/board/thecus/n2350/n2350.c b/board/thecus/n2350/n2350.c index fd8f95f944..05b125fd7f 100644 --- a/board/thecus/n2350/n2350.c +++ b/board/thecus/n2350/n2350.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; #define N2350_GPP_OUT_ENA_LOW (~(BIT(20) | BIT(21) | BIT(24))) #define N2350_GPP_OUT_ENA_MID (~(BIT(12) | BIT(13) | BIT(16) | BIT(19) | BIT(22))) #define N2350_GPP_OUT_VAL_LOW (BIT(21) | BIT(24)) -#define N2350_GPP_OUT_VAL_MID (BIT(0) | BIT(12) | BIT(13)) +#define N2350_GPP_OUT_VAL_MID (BIT(0) | BIT(12) | BIT(13) | BIT(16)) #define N2350_GPP_POL_LOW 0x0 #define N2350_GPP_POL_MID 0x0 |