Skip to contentSkip to conversation

Arm: meson: add support for p200 and p201 boards

PATCH Superseded Mohammad Rasim 2 participants 4 messages Mar 15, 2019 – Mar 23, 2019

Subsystems (3)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover Arm: meson: add support for p200 and p201 boards

This adds support for p200 and p201 reference boards from amlogic

Mohammad Rasim (5):
ARM: board: meson: rename odroid-c2 to p200
ARM: dts: meson: add p200 and p201 boards
Arm: dts: meson: add u-boot.dtsi for p200 and p201
ARM: board: meson: add p200 board
ARM: board: meson: add p201 board

 arch/arm/dts/Makefile                         |   2 +
 arch/arm/dts/meson-gxbb-p200-u-boot.dtsi      |   7 +
 arch/arm/dts/meson-gxbb-p200.dts              |  99 +++++++
 arch/arm/dts/meson-gxbb-p201-u-boot.dtsi      |   7 +
 arch/arm/dts/meson-gxbb-p201.dts              |  26 ++
 arch/arm/dts/meson-gxbb-p20x.dtsi             | 247 ++++++++++++++++++
 arch/arm/mach-meson/Kconfig                   |   2 +-
 board/amlogic/{odroid-c2 => p200}/MAINTAINERS |   6 +-
 board/amlogic/{odroid-c2 => p200}/Makefile    |   2 +-
 .../{odroid-c2 => p200}/README.nanopi-k2      |   0
 .../{odroid-c2 => p200}/README.odroid-c2      |   0
 board/amlogic/p200/README.p200                | 103 ++++++++
 .../{odroid-c2/odroid-c2.c => p200/p200.c}    |   0
 board/amlogic/p201/MAINTAINERS                |   5 +
 board/amlogic/p201/Makefile                   |   5 +
 board/amlogic/p201/README.p201                | 103 ++++++++
 board/amlogic/p201/p201.c                     |  43 +++
 configs/nanopi-k2_defconfig                   |   1 +
 configs/odroid-c2_defconfig                   |   1 +
 configs/p200_defconfig                        |  41 +++
 configs/p201_defconfig                        |  41 +++
 21 files changed, 736 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm/dts/meson-gxbb-p200-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-gxbb-p200.dts
 create mode 100644 arch/arm/dts/meson-gxbb-p201-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-gxbb-p201.dts
 create mode 100644 arch/arm/dts/meson-gxbb-p20x.dtsi
 rename board/amlogic/{odroid-c2 => p200}/MAINTAINERS (70%)
 rename board/amlogic/{odroid-c2 => p200}/Makefile (82%)
 rename board/amlogic/{odroid-c2 => p200}/README.nanopi-k2 (100%)
 rename board/amlogic/{odroid-c2 => p200}/README.odroid-c2 (100%)
 create mode 100644 board/amlogic/p200/README.p200
 rename board/amlogic/{odroid-c2/odroid-c2.c => p200/p200.c} (100%)
 create mode 100644 board/amlogic/p201/MAINTAINERS
 create mode 100644 board/amlogic/p201/Makefile
 create mode 100644 board/amlogic/p201/README.p201
 create mode 100644 board/amlogic/p201/p201.c
 create mode 100644 configs/p200_defconfig
 create mode 100644 configs/p201_defconfig

--
2.21.0

#1 lore raw

PATCH v4 1/5 ARM: board: meson: rename odroid-c2 to p200

This renames the odroid-c2 to p200 and set it as the default GXBB board Other boards (odroid-c2 and nanopi-k2) will inherit from p200

---
 arch/arm/mach-meson/Kconfig                   |   2 +-
 board/amlogic/{odroid-c2 => p200}/MAINTAINERS |   6 +-
 board/amlogic/{odroid-c2 => p200}/Makefile    |   2 +-
 .../{odroid-c2 => p200}/README.nanopi-k2      |   0
 .../{odroid-c2 => p200}/README.odroid-c2      |   0
 board/amlogic/p200/README.p200                | 103 ++++++++++++++++++
 .../{odroid-c2/odroid-c2.c => p200/p200.c}    |   0
 configs/nanopi-k2_defconfig                   |   1 +
 configs/odroid-c2_defconfig                   |   1 +
 9 files changed, 110 insertions(+), 5 deletions(-)
 rename board/amlogic/{odroid-c2 => p200}/MAINTAINERS (70%)
 rename board/amlogic/{odroid-c2 => p200}/Makefile (82%)
 rename board/amlogic/{odroid-c2 => p200}/README.nanopi-k2 (100%)
 rename board/amlogic/{odroid-c2 => p200}/README.odroid-c2 (100%)
 create mode 100644 board/amlogic/p200/README.p200
 rename board/amlogic/{odroid-c2/odroid-c2.c => p200/p200.c} (100%)
arch/arm/mach-meson/Kconfig +1 -1
index 11077bc6cc24..1b1d0aef0d22 100644
@@ -61,7 +61,7 @@ config SYS_VENDOR
 
 config SYS_BOARD
 	string "Board name"
-	default "odroid-c2" if MESON_GXBB
+	default "p200" if MESON_GXBB
 	default "p212" if MESON_GXL
 	default "q200" if MESON_GXM
 	default "s400" if MESON_AXG
board/amlogic/p200/MAINTAINERS renamed from board/amlogic/odroid-c2/MAINTAINERS +3 -3
similarity index 70%
rename from board/amlogic/odroid-c2/MAINTAINERS
rename to board/amlogic/p200/MAINTAINERS
index 6a853066d781..96fe92dd0874 100644
@@ -1,8 +1,8 @@
-ODROID-C2
+P200
 M:	Beniamino Galvani <[email protected]>
 M:	Neil Armstrong <[email protected]>
 S:	Maintained
-F:	board/amlogic/odroid-c2/
-F:	include/configs/odroid-c2.h
+F:	board/amlogic/p200/
 F:	configs/nanopi-k2_defconfig
 F:	configs/odroid-c2_defconfig
+F:	configs/p200_defconfig
board/amlogic/p200/Makefile renamed from board/amlogic/odroid-c2/Makefile +1 -1
similarity index 82%
rename from board/amlogic/odroid-c2/Makefile
rename to board/amlogic/p200/Makefile
index a6a3db755f21..f82a7ea9ca6b 100644
@@ -2,4 +2,4 @@
 #
 # (C) Copyright 2016 Beniamino Galvani <[email protected]>
 
-obj-y	:= odroid-c2.o
+obj-y	:= p200.o
board/amlogic/p200/README.nanopi-k2 renamed from board/amlogic/odroid-c2/README.nanopi-k2 +0 -0
similarity index 100%
rename from board/amlogic/odroid-c2/README.nanopi-k2
rename to board/amlogic/p200/README.nanopi-k2
board/amlogic/p200/README.odroid-c2 renamed from board/amlogic/odroid-c2/README.odroid-c2 +0 -0
similarity index 100%
rename from board/amlogic/odroid-c2/README.odroid-c2
rename to board/amlogic/p200/README.odroid-c2
board/amlogic/p200/README.p200 new file +103 -0

103 lines not on this page · raw message

board/amlogic/p200/p200.c renamed from board/amlogic/odroid-c2/odroid-c2.c +0 -0
similarity index 100%
rename from board/amlogic/odroid-c2/odroid-c2.c
rename to board/amlogic/p200/p200.c
configs/nanopi-k2_defconfig +1 -0
index 8bbf48f41f7d..a513bc7cf8ce 100644
@@ -38,3 +38,4 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SYS_BOARD="p200"
configs/odroid-c2_defconfig +1 -0
index 747da184b3ad..f19b291164b7 100644
@@ -39,3 +39,4 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SYS_BOARD="p200"

--
2.21.0

#2 lore raw

PATCH v4 1/5 ARM: board: meson: rename odroid-c2 to p200

Le 15/03/2019 16:11, Mohammad Rasim a écrit :

Quoted 11 lines

This renames the odroid-c2 to p200 and set it as the default GXBB board Other boards (odroid-c2 and nanopi-k2) will inherit from p200

---
 arch/arm/mach-meson/Kconfig                   |   2 +-
 board/amlogic/{odroid-c2 => p200}/MAINTAINERS |   6 +-
 board/amlogic/{odroid-c2 => p200}/Makefile    |   2 +-
 .../{odroid-c2 => p200}/README.nanopi-k2      |   0
 .../{odroid-c2 => p200}/README.odroid-c2      |   0
 board/amlogic/p200/README.p200                | 103 ++++++++++++++++++

This new file should go in patch 4

Quoted 32 lines
 .../{odroid-c2/odroid-c2.c => p200/p200.c}    |   0
 configs/nanopi-k2_defconfig                   |   1 +
 configs/odroid-c2_defconfig                   |   1 +
 9 files changed, 110 insertions(+), 5 deletions(-)
 rename board/amlogic/{odroid-c2 => p200}/MAINTAINERS (70%)
 rename board/amlogic/{odroid-c2 => p200}/Makefile (82%)
 rename board/amlogic/{odroid-c2 => p200}/README.nanopi-k2 (100%)
 rename board/amlogic/{odroid-c2 => p200}/README.odroid-c2 (100%)
 create mode 100644 board/amlogic/p200/README.p200
 rename board/amlogic/{odroid-c2/odroid-c2.c => p200/p200.c} (100%)
arch/arm/mach-meson/Kconfig +1 -1
index 11077bc6cc24..1b1d0aef0d22 100644
@@ -61,7 +61,7 @@ config SYS_VENDOR
 
 config SYS_BOARD
 	string "Board name"
-	default "odroid-c2" if MESON_GXBB
+	default "p200" if MESON_GXBB
 	default "p212" if MESON_GXL
 	default "q200" if MESON_GXM
 	default "s400" if MESON_AXG
board/amlogic/p200/MAINTAINERS renamed from board/amlogic/odroid-c2/MAINTAINERS +0 -0
similarity index 70%
rename from board/amlogic/odroid-c2/MAINTAINERS
rename to board/amlogic/p200/MAINTAINERS
index 6a853066d781..96fe92dd0874 100644

board/amlogic/p200/MAINTAINERS line 6

Quoted 7 lines
board/amlogic/p200/MAINTAINERS renamed from board/amlogic/odroid-c2/MAINTAINERS +1 -3
@@ -1,8 +1,8 @@
-ODROID-C2
+P200
 M:	Beniamino Galvani <[email protected]>
 M:	Neil Armstrong <[email protected]>
 S:	Maintained
-F:	board/amlogic/odroid-c2/
-F:	include/configs/odroid-c2.h

Good catch here

board/amlogic/p200/MAINTAINERS line 8

Quoted 4 lines
board/amlogic/p200/MAINTAINERS renamed from board/amlogic/odroid-c2/MAINTAINERS +2 -0
+F:	board/amlogic/p200/
 F:	configs/nanopi-k2_defconfig
 F:	configs/odroid-c2_defconfig
+F:	configs/p200_defconfig

You should add this one in patch 4

Quoted 149 lines
board/amlogic/p200/Makefile renamed from board/amlogic/odroid-c2/Makefile +1 -1
similarity index 82%
rename from board/amlogic/odroid-c2/Makefile
rename to board/amlogic/p200/Makefile
index a6a3db755f21..f82a7ea9ca6b 100644
@@ -2,4 +2,4 @@
 #
 # (C) Copyright 2016 Beniamino Galvani <[email protected]>
 
-obj-y	:= odroid-c2.o
+obj-y	:= p200.o
board/amlogic/p200/README.nanopi-k2 renamed from board/amlogic/odroid-c2/README.nanopi-k2 +0 -0
similarity index 100%
rename from board/amlogic/odroid-c2/README.nanopi-k2
rename to board/amlogic/p200/README.nanopi-k2
board/amlogic/p200/README.odroid-c2 renamed from board/amlogic/odroid-c2/README.odroid-c2 +0 -0
similarity index 100%
rename from board/amlogic/odroid-c2/README.odroid-c2
rename to board/amlogic/p200/README.odroid-c2
board/amlogic/p200/README.p200 new file +103 -0
new file mode 100644
index 000000000000..01d82d1e79e3
@@ -0,0 +1,103 @@
+U-Boot for Amlogic P200
+=======================
+
+P200 is a reference board manufactured by Amlogic with the following
+specifications:
+
+ - Amlogic S905 ARM Cortex-A53 quad-core SoC @ 1.5GHz
+ - ARM Mali 450 GPU
+ - 2GB DDR3 SDRAM
+ - Gigabit Ethernet
+ - HDMI 2.0 4K/60Hz display
+ - 2 x USB 2.0 Host
+ - eMMC, microSD
+ - Infrared receiver
+ - SDIO WiFi Module
+ - CVBS+Stereo Audio Jack
+
+Schematics are available from Amlogic on demand.
+
+Currently the u-boot port supports the following devices:
+ - serial
+ - eMMC, microSD
+ - Ethernet
+ - I2C
+ - Regulators
+ - Reset controller
+ - Clock controller
+ - USB Host
+ - ADC
+
+u-boot compilation
+==================
+
+ > export ARCH=arm
+ > export CROSS_COMPILE=aarch64-none-elf-
+ > make p200_defconfig
+ > make
+
+Image creation
+==============
+
+Amlogic doesn't provide sources for the firmware and for tools needed
+to create the bootloader image, so it is necessary to obtain them from
+the git tree published by the board vendor:
+
+ > wget https://releases.linaro.org/archive/13.11/components/toolchain/binaries/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz
+ > wget https://releases.linaro.org/archive/13.11/components/toolchain/binaries/gcc-linaro-arm-none-eabi-4.8-2013.11_linux.tar.xz
+ > tar xvfJ gcc-linaro-aarch64-none-elf-4.8-2013.11_linux.tar.xz
+ > tar xvfJ gcc-linaro-arm-none-eabi-4.8-2013.11_linux.tar.xz
+ > export PATH=$PWD/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux/bin:$PWD/gcc-linaro-arm-none-eabi-4.8-2013.11_linux/bin:$PATH
+ > git clone https://github.com/BayLibre/u-boot.git -b n-amlogic-openlinux-20170606 amlogic-u-boot
+ > cd amlogic-u-boot
+ > make gxb_p200_v1_defconfig
+ > make
+ > export FIPDIR=$PWD/fip
+
+Go back to mainline U-boot source tree then :
+ > mkdir fip
+
+ > cp $FIPDIR/gxl/bl2.bin fip/
+ > cp $FIPDIR/gxl/acs.bin fip/
+ > cp $FIPDIR/gxl/bl21.bin fip/
+ > cp $FIPDIR/gxl/bl30.bin fip/
+ > cp $FIPDIR/gxl/bl301.bin fip/
+ > cp $FIPDIR/gxl/bl31.img fip/
+ > cp u-boot.bin fip/bl33.bin
+
+ > $FIPDIR/blx_fix.sh \
+	fip/bl30.bin \
+	fip/zero_tmp \
+	fip/bl30_zero.bin \
+	fip/bl301.bin \
+	fip/bl301_zero.bin \
+	fip/bl30_new.bin \
+	bl30
+
+ > $FIPDIR/acs_tool.pyc fip/bl2.bin fip/bl2_acs.bin fip/acs.bin 0
+
+ > $FIPDIR/blx_fix.sh \
+	fip/bl2_acs.bin \
+	fip/zero_tmp \
+	fip/bl2_zero.bin \
+	fip/bl21.bin \
+	fip/bl21_zero.bin \
+	fip/bl2_new.bin \
+	bl2
+
+ > $FIPDIR/gxl/aml_encrypt_gxl --bl3enc --input fip/bl30_new.bin
+ > $FIPDIR/gxl/aml_encrypt_gxl --bl3enc --input fip/bl31.img
+ > $FIPDIR/gxl/aml_encrypt_gxl --bl3enc --input fip/bl33.bin
+ > $FIPDIR/gxl/aml_encrypt_gxl --bl2sig --input fip/bl2_new.bin --output fip/bl2.n.bin.sig
+ > $FIPDIR/gxl/aml_encrypt_gxl --bootmk \
+		--output fip/u-boot.bin \
+		--bl2 fip/bl2.n.bin.sig \
+		--bl30 fip/bl30_new.bin.enc \
+		--bl31 fip/bl31.img.enc \
+		--bl33 fip/bl33.bin.enc
+
+and then write the image to SD with:
+
+ > DEV=/dev/your_sd_device
+ > dd if=fip/u-boot.bin.sd.bin of=$DEV conv=fsync,notrunc bs=512 skip=1 seek=1
+ > dd if=fip/u-boot.bin.sd.bin of=$DEV conv=fsync,notrunc bs=1 count=444
board/amlogic/p200/p200.c renamed from board/amlogic/odroid-c2/odroid-c2.c +0 -0
similarity index 100%
rename from board/amlogic/odroid-c2/odroid-c2.c
rename to board/amlogic/p200/p200.c
configs/nanopi-k2_defconfig +1 -0
index 8bbf48f41f7d..a513bc7cf8ce 100644
@@ -38,3 +38,4 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SYS_BOARD="p200"
configs/odroid-c2_defconfig +0 -0
index 747da184b3ad..f19b291164b7 100644

configs/odroid-c2_defconfig CONFIG_DEBUG_UART_ANNOUNCE=y · line 42

Quoted 4 lines
configs/odroid-c2_defconfig +1 -0
@@ -39,3 +39,4 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SYS_BOARD="p200"

No need for these last two changes, you changed the default SYS_BOARD config to p200

Quoted 3 lines

--
2.21.0

Neil

#3 lore raw

v4 cover Arm: meson: add support for p200 and p201 boards

In reply to Mohammad Rasim

Hi,

Le 15/03/2019 16:11, Mohammad Rasim a écrit :

Quoted 50 lines

This adds support for p200 and p201 reference boards from amlogic

Mohammad Rasim (5):
ARM: board: meson: rename odroid-c2 to p200
ARM: dts: meson: add p200 and p201 boards
Arm: dts: meson: add u-boot.dtsi for p200 and p201
ARM: board: meson: add p200 board
ARM: board: meson: add p201 board

 arch/arm/dts/Makefile                         |   2 +
 arch/arm/dts/meson-gxbb-p200-u-boot.dtsi      |   7 +
 arch/arm/dts/meson-gxbb-p200.dts              |  99 +++++++
 arch/arm/dts/meson-gxbb-p201-u-boot.dtsi      |   7 +
 arch/arm/dts/meson-gxbb-p201.dts              |  26 ++
 arch/arm/dts/meson-gxbb-p20x.dtsi             | 247 ++++++++++++++++++
 arch/arm/mach-meson/Kconfig                   |   2 +-
 board/amlogic/{odroid-c2 => p200}/MAINTAINERS |   6 +-
 board/amlogic/{odroid-c2 => p200}/Makefile    |   2 +-
 .../{odroid-c2 => p200}/README.nanopi-k2      |   0
 .../{odroid-c2 => p200}/README.odroid-c2      |   0
 board/amlogic/p200/README.p200                | 103 ++++++++
 .../{odroid-c2/odroid-c2.c => p200/p200.c}    |   0
 board/amlogic/p201/MAINTAINERS                |   5 +
 board/amlogic/p201/Makefile                   |   5 +
 board/amlogic/p201/README.p201                | 103 ++++++++
 board/amlogic/p201/p201.c                     |  43 +++
 configs/nanopi-k2_defconfig                   |   1 +
 configs/odroid-c2_defconfig                   |   1 +
 configs/p200_defconfig                        |  41 +++
 configs/p201_defconfig                        |  41 +++
 21 files changed, 736 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm/dts/meson-gxbb-p200-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-gxbb-p200.dts
 create mode 100644 arch/arm/dts/meson-gxbb-p201-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-gxbb-p201.dts
 create mode 100644 arch/arm/dts/meson-gxbb-p20x.dtsi
 rename board/amlogic/{odroid-c2 => p200}/MAINTAINERS (70%)
 rename board/amlogic/{odroid-c2 => p200}/Makefile (82%)
 rename board/amlogic/{odroid-c2 => p200}/README.nanopi-k2 (100%)
 rename board/amlogic/{odroid-c2 => p200}/README.odroid-c2 (100%)
 create mode 100644 board/amlogic/p200/README.p200
 rename board/amlogic/{odroid-c2/odroid-c2.c => p200/p200.c} (100%)
 create mode 100644 board/amlogic/p201/MAINTAINERS
 create mode 100644 board/amlogic/p201/Makefile
 create mode 100644 board/amlogic/p201/README.p201
 create mode 100644 board/amlogic/p201/p201.c
 create mode 100644 configs/p200_defconfig
 create mode 100644 configs/p201_defconfig
Quoted 3 lines

--
2.21.0

With the two small changes and the p200 changes from patch 1 to patch 4, I'll apply this to u-boot-amlogic !

Neil