Skip to contentSkip to conversation

amlogic: add SEI610 support

PATCH New Neil Armstrong 1 participant 11 messages Oct 11, 2019 – Oct 18, 2019

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

cover amlogic: add SEI610 support

Add support for the customer board SEI610 manufactured by SEI Robotics with the following specifications:
- Amlogic S905X3 ARM Cortex-A35 quad-core SoC
- 2GB DDR4 SDRAM
- 10/100 Ethernet (Internal PHY)
- 1 x USB 3.0 Host
- 1 x USB Type-C DRD
- 1 x FTDI USB Serial Debug Interface
- eMMC
- SDcard
- Infrared receiver
- SDIO WiFi Module

Like it's SEI510 counterpart, the boot flow is designed to boot Android AOSP built for the Yukawa Android device.

The SM1 SoC is very close to G12A, so it uses the same arm board code and reuses what was pushed for SEI510.

For that it needs to reuse the SEI510 android boot flow into a common flow with custom partitions for each board.

Guillaume La Roque (2):
configs: sei510: rework header and fix userdata size
configs: sei610: Add config file to fix userdata size

Neil Armstrong (6):
ARM: meson: add SM1 SoC id
mmc: meson-gx: add support for mmc-pwrseq-emmc
clk: meson-sm1: add compatible
ARM: dts: Import SEI610 DT from Linux 5.4-rc2
ARM: dts: meson-sm1: add U-Boot specific DT for graphics
boards: amlogic: add SEI610 support

 MAINTAINERS                                   |   1 +
 arch/arm/dts/Makefile                         |   3 +-
 ...boot.dtsi => meson-g12-common-u-boot.dtsi} |   0
 arch/arm/dts/meson-g12a-sei510-u-boot.dtsi    |   2 +-
 arch/arm/dts/meson-g12a-u200-u-boot.dtsi      |   2 +-
 arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi |   2 +-
 arch/arm/dts/meson-sm1-sei610-u-boot.dtsi     |   7 +
 arch/arm/dts/meson-sm1-sei610.dts             | 383 ++++++++++++++++++
 arch/arm/dts/meson-sm1.dtsi                   | 147 +++++++
 arch/arm/mach-meson/board-info.c              |   2 +
 board/amlogic/sei610/MAINTAINERS              |   7 +
 board/amlogic/sei610/Makefile                 |   6 +
 board/amlogic/sei610/README                   | 119 ++++++
 board/amlogic/sei610/sei610.c                 |  26 ++
 configs/sei610_defconfig                      |  76 ++++
 drivers/clk/meson/g12a.c                      |   1 +
 drivers/mmc/meson_gx_mmc.c                    |  51 +++
 include/configs/meson64_android.h             | 136 +++++++
 include/configs/sei510.h                      | 121 +-----
 include/configs/sei610.h                      |  31 ++
 include/dt-bindings/power/meson-sm1-power.h   |  18 +
 21 files changed, 1018 insertions(+), 123 deletions(-)
 rename arch/arm/dts/{meson-g12a-u-boot.dtsi => meson-g12-common-u-boot.dtsi} (100%)
 create mode 100644 arch/arm/dts/meson-sm1-sei610-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-sm1-sei610.dts
 create mode 100644 arch/arm/dts/meson-sm1.dtsi
 create mode 100644 board/amlogic/sei610/MAINTAINERS
 create mode 100644 board/amlogic/sei610/Makefile
 create mode 100644 board/amlogic/sei610/README
 create mode 100644 board/amlogic/sei610/sei610.c
 create mode 100644 configs/sei610_defconfig
 create mode 100644 include/configs/meson64_android.h
 create mode 100644 include/configs/sei610.h
 create mode 100644 include/dt-bindings/power/meson-sm1-power.h
Signature · 1 line
2.22.0
#1 lore raw

PATCH 1/8 ARM: meson: add SM1 SoC id

Add the missing IDs to detect the SM1 S905X3 SoC.

---
 arch/arm/mach-meson/board-info.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-meson/board-info.c +2 -0
index 9571b5a189..0d3b40a249 100644
@@ -34,6 +34,7 @@ static const struct meson_gx_soc_id {
 	{ "TXHD",   0x27 },
 	{ "G12A",   0x28 },
 	{ "G12B",   0x29 },
+	{ "SM1",    0x2b },
 };
 
 static const struct meson_gx_package_id {
@@ -61,6 +62,7 @@ static const struct meson_gx_package_id {
 	{ "S905X2", 0x28, 0x40, 0xf0 },
 	{ "A311D",  0x29, 0x10, 0xf0 },
 	{ "S922X",  0x29, 0x40, 0xf0 },
+	{ "S905X3", 0x2b, 0x5, 0xf },
 };
 
 DECLARE_GLOBAL_DATA_PTR;
Signature · 1 line
2.22.0
#2 lore raw

PATCH 2/8 mmc: meson-gx: add support for mmc-pwrseq-emmc

In reply to Neil Armstrong

Add support for mmc-pwrseq-emmc in the meson-gx mmc driver to support enabling the eMMC.

---
 drivers/mmc/meson_gx_mmc.c | 51 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
drivers/mmc/meson_gx_mmc.c +51 -0
index 767dfff805..031cc79ccb 100644
@@ -7,8 +7,10 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <pwrseq.h>
 #include <mmc.h>
 #include <asm/io.h>
+#include <asm/gpio.h>
 #include <asm/arch/sd_emmc.h>
 #include <linux/log2.h>
 
@@ -239,6 +241,10 @@ static int meson_mmc_probe(struct udevice *dev)
 	struct mmc *mmc = &pdata->mmc;
 	struct mmc_config *cfg = &pdata->cfg;
 	uint32_t val;
+#ifdef CONFIG_PWRSEQ
+	struct udevice *pwr_dev;
+	int ret;
+#endif
 
 	cfg->voltages = MMC_VDD_33_34 | MMC_VDD_32_33 |
 			MMC_VDD_31_32 | MMC_VDD_165_195;
@@ -254,6 +260,17 @@ static int meson_mmc_probe(struct udevice *dev)
 
 	mmc_set_clock(mmc, cfg->f_min, MMC_CLK_ENABLE);
 
+#ifdef CONFIG_PWRSEQ
+	/* Enable power if needed */
+	ret = uclass_get_device_by_phandle(UCLASS_PWRSEQ, dev, "mmc-pwrseq",
+					   &pwr_dev);
+	if (!ret) {
+		ret = pwrseq_set_power(pwr_dev, true);
+		if (ret)
+			return ret;
+	}
+#endif
+
 	/* reset all status bits */
 	meson_write(mmc, STATUS_MASK, MESON_SD_EMMC_STATUS);
 
@@ -292,3 +309,37 @@ U_BOOT_DRIVER(meson_mmc) = {
 	.ofdata_to_platdata = meson_mmc_ofdata_to_platdata,
 	.platdata_auto_alloc_size = sizeof(struct meson_mmc_platdata),
 };
+
+#ifdef CONFIG_PWRSEQ
+static int meson_mmc_pwrseq_set_power(struct udevice *dev, bool enable)
+{
+	struct gpio_desc reset;
+	int ret;
+
+	ret = gpio_request_by_name(dev, "reset-gpios", 0, &reset, GPIOD_IS_OUT);
+	if (ret)
+		return ret;
+	dm_gpio_set_value(&reset, 1);
+	udelay(1);
+	dm_gpio_set_value(&reset, 0);
+	udelay(200);
+
+	return 0;
+}
+
+static const struct pwrseq_ops meson_mmc_pwrseq_ops = {
+	.set_power	= meson_mmc_pwrseq_set_power,
+};
+
+static const struct udevice_id meson_mmc_pwrseq_ids[] = {
+	{ .compatible = "mmc-pwrseq-emmc" },
+	{ }
+};
+
+U_BOOT_DRIVER(meson_mmc_pwrseq_drv) = {
+	.name		= "mmc_pwrseq_emmc",
+	.id		= UCLASS_PWRSEQ,
+	.of_match	= meson_mmc_pwrseq_ids,
+	.ops		= &meson_mmc_pwrseq_ops,
+};
+#endif
Signature · 1 line
2.22.0
#3 lore raw

PATCH 3/8 clk: meson-sm1: add compatible

In reply to Neil Armstrong

The SM1 clock controller is almost identical to the G12A and so far the differences don't matter.

---
 drivers/clk/meson/g12a.c | 1 +
 1 file changed, 1 insertion(+)
drivers/clk/meson/g12a.c +1 -0
index c03738b6ca..1b2523bbf1 100644
@@ -992,6 +992,7 @@ static struct clk_ops meson_clk_ops = {
 static const struct udevice_id meson_clk_ids[] = {
 	{ .compatible = "amlogic,g12a-clkc" },
 	{ .compatible = "amlogic,g12b-clkc" },
+	{ .compatible = "amlogic,sm1-clkc" },
 	{ }
 };
 
Signature · 1 line
2.22.0
#4 lore raw

PATCH 4/8 ARM: dts: Import SEI610 DT from Linux 5.4-rc2

In reply to Neil Armstrong

Import the Amlogic SM1 DT and the SEI610 board DT from [1]

[1] da0c9ea146cb ("Linux 5.4-rc2")

---
 arch/arm/dts/Makefile                       |   3 +-
 arch/arm/dts/meson-sm1-sei610.dts           | 383 ++++++++++++++++++++
 arch/arm/dts/meson-sm1.dtsi                 | 147 ++++++++
 include/dt-bindings/power/meson-sm1-power.h |  18 +
 4 files changed, 550 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/meson-sm1-sei610.dts
 create mode 100644 arch/arm/dts/meson-sm1.dtsi
 create mode 100644 include/dt-bindings/power/meson-sm1-power.h
arch/arm/dts/Makefile +2 -1
index aac3d21ef8..f5b9286fdf 100644
@@ -142,7 +142,8 @@ dtb-$(CONFIG_ARCH_MESON) += \
 	meson-g12a-u200.dtb \
 	meson-g12a-sei510.dtb \
 	meson-g12b-odroid-n2.dtb \
-	meson-g12b-a311d-khadas-vim3.dtb
+	meson-g12b-a311d-khadas-vim3.dtb \
+	meson-sm1-sei610.dtb
 dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
 	tegra20-medcom-wide.dtb \
 	tegra20-paz00.dtb \
arch/arm/dts/meson-sm1-sei610.dts new file +383 -0

383 lines not on this page · raw message

arch/arm/dts/meson-sm1.dtsi new file +147 -0

147 lines not on this page · raw message

include/dt-bindings/power/meson-sm1-power.h new file +18 -0
new file mode 100644
index 0000000000..a020ab00c1
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
+/*
+ * Copyright (c) 2019 BayLibre, SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#ifndef _DT_BINDINGS_MESON_SM1_POWER_H
+#define _DT_BINDINGS_MESON_SM1_POWER_H
+
+#define PWRC_SM1_VPU_ID		0
+#define PWRC_SM1_NNA_ID		1
+#define PWRC_SM1_USB_ID		2
+#define PWRC_SM1_PCIE_ID	3
+#define PWRC_SM1_GE2D_ID	4
+#define PWRC_SM1_AUDIO_ID	5
+#define PWRC_SM1_ETH_ID		6
+
+#endif
Signature · 1 line
2.22.0
#5 lore raw

PATCH 5/8 ARM: dts: meson-sm1: add U-Boot specific DT for graphics

In reply to Neil Armstrong

Rename meson-g12a-u-boot.dtsi into meson-g12-common-u-boot.dtsi to match the new DT architecture and add meson-sm1-sei610-u-boot.dtsi to handle the U-Boot specific DT for graphics.

---
 ...meson-g12a-u-boot.dtsi => meson-g12-common-u-boot.dtsi} | 0
 arch/arm/dts/meson-g12a-sei510-u-boot.dtsi                 | 2 +-
 arch/arm/dts/meson-g12a-u200-u-boot.dtsi                   | 2 +-
 arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi              | 2 +-
 arch/arm/dts/meson-sm1-sei610-u-boot.dtsi                  | 7 +++++++
 5 files changed, 10 insertions(+), 3 deletions(-)
 rename arch/arm/dts/{meson-g12a-u-boot.dtsi => meson-g12-common-u-boot.dtsi} (100%)
 create mode 100644 arch/arm/dts/meson-sm1-sei610-u-boot.dtsi
arch/arm/dts/meson-g12-common-u-boot.dtsi renamed from arch/arm/dts/meson-g12a-u-boot.dtsi +0 -0
similarity index 100%
rename from arch/arm/dts/meson-g12a-u-boot.dtsi
rename to arch/arm/dts/meson-g12-common-u-boot.dtsi
arch/arm/dts/meson-g12a-sei510-u-boot.dtsi +1 -1
index fddffd628c..236f2468dc 100644
@@ -4,4 +4,4 @@
  * Author: Neil Armstrong <[email protected]>
  */
 
-#include "meson-g12a-u-boot.dtsi"
+#include "meson-g12-common-u-boot.dtsi"
arch/arm/dts/meson-g12a-u200-u-boot.dtsi +1 -1
index fddffd628c..236f2468dc 100644
@@ -4,4 +4,4 @@
  * Author: Neil Armstrong <[email protected]>
  */
 
-#include "meson-g12a-u-boot.dtsi"
+#include "meson-g12-common-u-boot.dtsi"
arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi +1 -1
index fddffd628c..236f2468dc 100644
@@ -4,4 +4,4 @@
  * Author: Neil Armstrong <[email protected]>
  */
 
-#include "meson-g12a-u-boot.dtsi"
+#include "meson-g12-common-u-boot.dtsi"
arch/arm/dts/meson-sm1-sei610-u-boot.dtsi new file +7 -0
new file mode 100644
index 0000000000..236f2468dc
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS.
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#include "meson-g12-common-u-boot.dtsi"
Signature · 1 line
2.22.0
#6 lore raw

PATCH 6/8 boards: amlogic: add SEI610 support

In reply to Neil Armstrong

Add support for the customer board SEI610 manufactured by SEI Robotics with the following specifications:
- Amlogic S905X3 ARM Cortex-A35 quad-core SoC
- 2GB DDR4 SDRAM
- 10/100 Ethernet (Internal PHY)
- 1 x USB 3.0 Host
- 1 x USB Type-C DRD
- 1 x FTDI USB Serial Debug Interface
- eMMC
- SDcard
- Infrared receiver
- SDIO WiFi Module

Like it's SEI510 counterpart, the boot flow is designed to boot Android AOSP built for the Yukawa Android device.

---
 board/amlogic/sei610/MAINTAINERS |   6 ++
 board/amlogic/sei610/Makefile    |   6 ++
 board/amlogic/sei610/README      | 119 +++++++++++++++++++++++++++++++
 board/amlogic/sei610/sei610.c    |  26 +++++++
 configs/sei610_defconfig         |  76 ++++++++++++++++++++
 5 files changed, 233 insertions(+)
 create mode 100644 board/amlogic/sei610/MAINTAINERS
 create mode 100644 board/amlogic/sei610/Makefile
 create mode 100644 board/amlogic/sei610/README
 create mode 100644 board/amlogic/sei610/sei610.c
 create mode 100644 configs/sei610_defconfig
board/amlogic/sei610/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000000..20f12334e9
@@ -0,0 +1,6 @@
+SEI610
+M:	Neil Armstrong <[email protected]>
+S:	Maintained
+L:	u-boot-amlogic at groups.io
+F:	board/amlogic/sei610/
+F:	configs/sei610_defconfig
board/amlogic/sei610/Makefile new file +6 -0
new file mode 100644
index 0000000000..428792afea
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2016 BayLibre, SAS
+# Author: Neil Armstrong <[email protected]>
+
+obj-y	:= sei610.o
board/amlogic/sei610/README new file +119 -0

119 lines not on this page · raw message

board/amlogic/sei610/sei610.c new file +26 -0
new file mode 100644
index 0000000000..b17eb9ef55
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2016 BayLibre, SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <env_internal.h>
+#include <asm/io.h>
+#include <asm/arch/axg.h>
+#include <asm/arch/sm.h>
+#include <asm/arch/eth.h>
+#include <asm/arch/mem.h>
+
+int misc_init_r(void)
+{
+	meson_eth_init(PHY_INTERFACE_MODE_RMII,
+		       MESON_USE_INTERNAL_RMII_PHY);
+
+	meson_generate_serial_ethaddr();
+
+	env_set("serial#", "AMLG12ASEI610");
+
+	return 0;
+}
configs/sei610_defconfig new file +76 -0

76 lines not on this page · raw message

Signature · 1 line
2.22.0
#7 lore raw

PATCH 6/8 boards: amlogic: add SEI610 support

Quoted 3 lines · Neil Armstrong

Add support for the customer board SEI610 manufactured by SEI Robotics with the following specifications:
- Amlogic S905X3 ARM Cortex-A35 quad-core SoC

--------------------------------/\

Cortex-A55, will fix while applying

Quoted 57 lines

- 2GB DDR4 SDRAM
- 10/100 Ethernet (Internal PHY)
- 1 x USB 3.0 Host
- 1 x USB Type-C DRD
- 1 x FTDI USB Serial Debug Interface
- eMMC
- SDcard
- Infrared receiver
- SDIO WiFi Module

Like it's SEI510 counterpart, the boot flow is designed to boot Android AOSP built for the Yukawa Android device.

---
 board/amlogic/sei610/MAINTAINERS |   6 ++
 board/amlogic/sei610/Makefile    |   6 ++
 board/amlogic/sei610/README      | 119 +++++++++++++++++++++++++++++++
 board/amlogic/sei610/sei610.c    |  26 +++++++
 configs/sei610_defconfig         |  76 ++++++++++++++++++++
 5 files changed, 233 insertions(+)
 create mode 100644 board/amlogic/sei610/MAINTAINERS
 create mode 100644 board/amlogic/sei610/Makefile
 create mode 100644 board/amlogic/sei610/README
 create mode 100644 board/amlogic/sei610/sei610.c
 create mode 100644 configs/sei610_defconfig
board/amlogic/sei610/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000000..20f12334e9
@@ -0,0 +1,6 @@
+SEI610
+M:	Neil Armstrong <[email protected]>
+S:	Maintained
+L:	u-boot-amlogic at groups.io
+F:	board/amlogic/sei610/
+F:	configs/sei610_defconfig
board/amlogic/sei610/Makefile new file +6 -0
new file mode 100644
index 0000000000..428792afea
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2016 BayLibre, SAS
+# Author: Neil Armstrong <[email protected]>
+
+obj-y	:= sei610.o
board/amlogic/sei610/README new file +0 -0
new file mode 100644
index 0000000000..836809ccdb

board/amlogic/sei610/README line 7

Quoted 7 lines
board/amlogic/sei610/README new file +7 -0
@@ -0,0 +1,119 @@
+U-Boot for Amlogic SEI610
+=======================
+
+SEI610 is a customer board manufactured by SEI Robotics with the following
+specifications:
+
+ - Amlogic S905X3 ARM Cortex-A35 quad-core SoC

--------------------------------/\

Cortex-A55, will fix while applying

Quoted 227 lines
board/amlogic/sei610/README new file +112 -0
+ - 2GB DDR4 SDRAM
+ - 10/100 Ethernet (Internal PHY)
+ - 1 x USB 3.0 Host
+ - 1 x USB Type-C DRD
+ - 1 x FTDI USB Serial Debug Interface
+ - eMMC
+ - SDcard
+ - Infrared receiver
+ - SDIO WiFi Module
+
+u-boot compilation
+==================
+
+ > export ARCH=arm
+ > export CROSS_COMPILE=aarch64-none-elf-
+ > make sei610_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 buildroot-openlinux-4.9-g12a-201904 amlogic-u-boot
+ > cd amlogic-u-boot
+ > make sm1_ac200_v1_defconfig
+ > make
+ > export UBOOTDIR=$PWD
+
+Download the latest Amlogic Buildroot package, and extract it :
+ > wget http://openlinux2.amlogic.com:8000/ARM/filesystem/buildroot-openlinux-A113-201901.tgz
+ > tar xfz buildroot-openlinux-A113-201901.tgz buildroot-openlinux-A113-201901/bootloader
+ > export BRDIR=$PWD/buildroot-openlinux-A113-201901
+ > export FIPDIR=$BRDIR/bootloader/uboot-repo/fip
+
+Go back to mainline U-Boot source tree then :
+ > mkdir fip
+
+ > wget https://github.com/BayLibre/u-boot/releases/download/v2017.11-libretech-cc/blx_fix_g12a.sh -O fip/blx_fix.sh
+ > cp $UBOOTDIR/build/scp_task/bl301.bin fip/
+ > cp $UBOOTDIR/build/board/amlogic/g12a_u200_v1/firmware/acs.bin fip/
+ > cp $BRDIR/bootloader/uboot-repo/bl2/bin/g12a/bl2.bin fip/
+ > cp $BRDIR/bootloader/uboot-repo/bl30/bin/g12a/bl30.bin fip/
+ > cp $BRDIR/bootloader/uboot-repo/bl31_1.3/bin/g12a/bl31.img fip/
+ > cp $FIPDIR/g12a/ddr3_1d.fw fip/
+ > cp $FIPDIR/g12a/ddr4_1d.fw fip/
+ > cp $FIPDIR/g12a/ddr4_2d.fw fip/
+ > cp $FIPDIR/g12a/diag_lpddr4.fw fip/
+ > cp $FIPDIR/g12a/lpddr4_1d.fw fip/
+ > cp $FIPDIR/g12a/lpddr4_2d.fw fip/
+ > cp $FIPDIR/g12a/piei.fw fip/
+ > cp u-boot.bin fip/bl33.bin
+
+ > sh fip/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
+
+ > sh fip/blx_fix.sh \
+	fip/bl2.bin \
+	fip/zero_tmp \
+	fip/bl2_zero.bin \
+	fip/acs.bin \
+	fip/bl21_zero.bin \
+	fip/bl2_new.bin \
+	bl2
+
+ > $FIPDIR/g12a/aml_encrypt_g12a --bl30sig --input fip/bl30_new.bin \
+					--output fip/bl30_new.bin.g12a.enc \
+					--level v3
+ > $FIPDIR/g12a/aml_encrypt_g12a --bl3sig --input fip/bl30_new.bin.g12a.enc \
+					--output fip/bl30_new.bin.enc \
+					--level v3 --type bl30
+ > $FIPDIR/g12a/aml_encrypt_g12a --bl3sig --input fip/bl31.img \
+					--output fip/bl31.img.enc \
+					--level v3 --type bl31
+ > $FIPDIR/g12a/aml_encrypt_g12a --bl3sig --input fip/bl33.bin --compress lz4 \
+					--output fip/bl33.bin.enc \
+					--level v3 --type bl33
+ > $FIPDIR/g12a/aml_encrypt_g12a --bl2sig --input fip/bl2_new.bin \
+					--output fip/bl2.n.bin.sig
+ > $FIPDIR/g12a/aml_encrypt_g12a --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 \
+		--ddrfw1 fip/ddr4_1d.fw \
+		--ddrfw2 fip/ddr4_2d.fw \
+		--ddrfw3 fip/ddr3_1d.fw \
+		--ddrfw4 fip/piei.fw \
+		--ddrfw5 fip/lpddr4_1d.fw \
+		--ddrfw6 fip/lpddr4_2d.fw \
+		--ddrfw7 fip/diag_lpddr4.fw \
+		--level v3
+
+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/sei610/sei610.c new file +26 -0
new file mode 100644
index 0000000000..b17eb9ef55
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2016 BayLibre, SAS
+ * Author: Neil Armstrong <[email protected]>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <env_internal.h>
+#include <asm/io.h>
+#include <asm/arch/axg.h>
+#include <asm/arch/sm.h>
+#include <asm/arch/eth.h>
+#include <asm/arch/mem.h>
+
+int misc_init_r(void)
+{
+	meson_eth_init(PHY_INTERFACE_MODE_RMII,
+		       MESON_USE_INTERNAL_RMII_PHY);
+
+	meson_generate_serial_ethaddr();
+
+	env_set("serial#", "AMLG12ASEI610");
+
+	return 0;
+}
configs/sei610_defconfig new file +76 -0
new file mode 100644
index 0000000000..89e7bd7bab
@@ -0,0 +1,76 @@
+CONFIG_ARM=y
+CONFIG_SYS_BOARD="sei610"
+CONFIG_SYS_CONFIG_NAME="sei510"
+CONFIG_ARCH_MESON=y
+CONFIG_SYS_TEXT_BASE=0x01000000
+CONFIG_MESON_G12A=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_DEBUG_UART_BASE=0xff803000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_IDENT_STRING=" sei610"
+# CONFIG_PSCI_RESET is not set
+CONFIG_DEBUG_UART=y
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="run load_logo"
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_MISC_INIT_R=y
+# CONFIG_DISPLAY_CPUINFO is not set
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_BMP=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-sei610"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x6000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=2
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_GPIO=y
+# CONFIG_INPUT is not set
+CONFIG_PWRSEQ=y
+CONFIG_DM_MMC=y
+CONFIG_MMC_MESON_GX=y
+CONFIG_PHY_ADDR_ENABLE=y
+CONFIG_PHY_ADDR=8
+CONFIG_DM_ETH=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_MESON_G12A_USB_PHY=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_MESON_EE_POWER_DOMAIN=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_RESET=y
+CONFIG_DEBUG_UART_MESON=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_MESON_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_MESON_G12A=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
+CONFIG_USB_GADGET_PRODUCT_NUM=0xfada
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
+CONFIG_VIDEO_MESON=y
+CONFIG_VIDEO_DT_SIMPLEFB=y
+CONFIG_LZ4=y
+CONFIG_OF_LIBFDT_OVERLAY=y
#8 lore raw

PATCH 7/8 configs: sei510: rework header and fix userdata size

In reply to Neil Armstrong

From: Guillaume La Roque <[email protected]>

Move android generic config and boot sequence in meson64_android header and fix size of userdata to use all eMMC on SEI510.

---
 MAINTAINERS                       |   1 +
 include/configs/meson64_android.h | 136 ++++++++++++++++++++++++++++++
 include/configs/sei510.h          | 121 +-------------------------
 3 files changed, 139 insertions(+), 119 deletions(-)
 create mode 100644 include/configs/meson64_android.h
MAINTAINERS +1 -0
index c53656695a..e874a44c31 100644
@@ -137,6 +137,7 @@ F:	drivers/pinctrl/meson/
 F:	drivers/power/domain/meson-gx-pwrc-vpu.c
 F:	drivers/video/meson/
 F:	include/configs/meson64.h
+F:	include/configs/meson64_android.h
 N:	meson
 
 ARM BROADCOM BCM283X
include/configs/meson64_android.h new file +136 -0

136 lines not on this page · raw message

include/configs/sei510.h +2 -119

135 lines not on this page · raw message

Signature · 1 line
2.22.0
#9 lore raw

PATCH 8/8 configs: sei610: Add config file to fix userdata size

In reply to Neil Armstrong

From: Guillaume La Roque <[email protected]>

Add separate config file to handle the different eMMC size on the sei610 board.

---
 board/amlogic/sei610/MAINTAINERS |  1 +
 configs/sei610_defconfig         |  2 +-
 include/configs/sei610.h         | 31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 include/configs/sei610.h
board/amlogic/sei610/MAINTAINERS +1 -0
index 20f12334e9..da77aafa41 100644
@@ -4,3 +4,4 @@ S:	Maintained
 L:	u-boot-amlogic at groups.io
 F:	board/amlogic/sei610/
 F:	configs/sei610_defconfig
+F:	include/configs/sei610.h
configs/sei610_defconfig +1 -1
index 89e7bd7bab..520a683d2e 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SYS_BOARD="sei610"
-CONFIG_SYS_CONFIG_NAME="sei510"
+CONFIG_SYS_CONFIG_NAME="sei610"
 CONFIG_ARCH_MESON=y
 CONFIG_SYS_TEXT_BASE=0x01000000
 CONFIG_MESON_G12A=y
include/configs/sei610.h new file +31 -0
new file mode 100644
index 0000000000..6d093161c9
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Configuration for the SEI510
+ *
+ * Copyright (C) 2019 Baylibre, SAS
+ * Author: Jerome Brunet <[email protected]>
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;"
+#define CACHE_UUID "99207ae6-5207-11e9-999e-6f77a3612069;"
+#define SYSTEM_UUID "99f9b7ac-5207-11e9-8507-c3c037e393f3;"
+#define VENDOR_UUID "9d082802-5207-11e9-954c-cbbce08ba108;"
+#define USERDATA_UUID "9b976e42-5207-11e9-8f16-ff47ac594b22;"
+#define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;"
+
+#define PARTS_DEFAULT                                        \
+	"uuid_disk=${uuid_gpt_disk};"  			\
+	"name=boot,size=64M,bootable,uuid=${uuid_gpt_boot};" \
+	"name=logo,size=2M,uuid=" LOGO_UUID             \
+	"name=cache,size=256M,uuid=" CACHE_UUID             \
+	"name=system,size=1536M,uuid=" SYSTEM_UUID           \
+	"name=vendor,size=256M,uuid=" VENDOR_UUID            \
+	"name=userdata,size=12795M,uuid=" USERDATA_UUID	\
+	"name=rootfs,size=-,uuid=" ROOT_UUID
+
+#include <configs/meson64_android.h>
+
+#endif /* __CONFIG_H */
Signature · 1 line
2.22.0
#10 lore raw

cover amlogic: add SEI610 support

In reply to Neil Armstrong
Quoted 60 lines · Neil Armstrong

Add support for the customer board SEI610 manufactured by SEI Robotics with the following specifications:
- Amlogic S905X3 ARM Cortex-A35 quad-core SoC
- 2GB DDR4 SDRAM
- 10/100 Ethernet (Internal PHY)
- 1 x USB 3.0 Host
- 1 x USB Type-C DRD
- 1 x FTDI USB Serial Debug Interface
- eMMC
- SDcard
- Infrared receiver
- SDIO WiFi Module

Like it's SEI510 counterpart, the boot flow is designed to boot Android AOSP built for the Yukawa Android device.

The SM1 SoC is very close to G12A, so it uses the same arm board code and reuses what was pushed for SEI510.

For that it needs to reuse the SEI510 android boot flow into a common flow with custom partitions for each board.

Guillaume La Roque (2):
configs: sei510: rework header and fix userdata size
configs: sei610: Add config file to fix userdata size

Neil Armstrong (6):
ARM: meson: add SM1 SoC id
mmc: meson-gx: add support for mmc-pwrseq-emmc
clk: meson-sm1: add compatible
ARM: dts: Import SEI610 DT from Linux 5.4-rc2
ARM: dts: meson-sm1: add U-Boot specific DT for graphics
boards: amlogic: add SEI610 support

 MAINTAINERS                                   |   1 +
 arch/arm/dts/Makefile                         |   3 +-
 ...boot.dtsi => meson-g12-common-u-boot.dtsi} |   0
 arch/arm/dts/meson-g12a-sei510-u-boot.dtsi    |   2 +-
 arch/arm/dts/meson-g12a-u200-u-boot.dtsi      |   2 +-
 arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi |   2 +-
 arch/arm/dts/meson-sm1-sei610-u-boot.dtsi     |   7 +
 arch/arm/dts/meson-sm1-sei610.dts             | 383 ++++++++++++++++++
 arch/arm/dts/meson-sm1.dtsi                   | 147 +++++++
 arch/arm/mach-meson/board-info.c              |   2 +
 board/amlogic/sei610/MAINTAINERS              |   7 +
 board/amlogic/sei610/Makefile                 |   6 +
 board/amlogic/sei610/README                   | 119 ++++++
 board/amlogic/sei610/sei610.c                 |  26 ++
 configs/sei610_defconfig                      |  76 ++++
 drivers/clk/meson/g12a.c                      |   1 +
 drivers/mmc/meson_gx_mmc.c                    |  51 +++
 include/configs/meson64_android.h             | 136 +++++++
 include/configs/sei510.h                      | 121 +-----
 include/configs/sei610.h                      |  31 ++
 include/dt-bindings/power/meson-sm1-power.h   |  18 +
 21 files changed, 1018 insertions(+), 123 deletions(-)
 rename arch/arm/dts/{meson-g12a-u-boot.dtsi => meson-g12-common-u-boot.dtsi} (100%)
 create mode 100644 arch/arm/dts/meson-sm1-sei610-u-boot.dtsi
 create mode 100644 arch/arm/dts/meson-sm1-sei610.dts
 create mode 100644 arch/arm/dts/meson-sm1.dtsi
Quoted 9 lines
 create mode 100644 board/amlogic/sei610/MAINTAINERS
 create mode 100644 board/amlogic/sei610/Makefile
 create mode 100644 board/amlogic/sei610/README
 create mode 100644 board/amlogic/sei610/sei610.c
 create mode 100644 configs/sei610_defconfig
 create mode 100644 include/configs/meson64_android.h
 create mode 100644 include/configs/sei610.h
 create mode 100644 include/dt-bindings/power/meson-sm1-power.h

Applied to u-boot-amlogic + typo fixes