Skip to contentSkip to conversation

DEVELOPERS: Fix file order list maintained by me

PATCH New Jagan Teki 4 participants 12 messages Sep 3, 2018 – Sep 6, 2018

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/4 DEVELOPERS: Fix file order list maintained by me

Files list maintained by me in DEVELOPERS file is not in proper order, fix it with ascending order.

---
 DEVELOPERS | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
DEVELOPERS +8 -8
index 03d9df0..a4c1297 100644
@@ -901,9 +901,6 @@ F:	board/amarula/
 F:	board/asus/
 F:	board/bananapi/
 F:	board/engicam/
-F:	configs/amarula_a64_relic_defconfig
-F:	configs/amarula_vyasa_rk3288_defconfig
-F:	configs/asus_tinker_rk3288_defconfig
 F:	board/friendlyarm/nanopi-a64/
 F:	board/friendlyarm/nanopi-neo2/
 F:	board/olimex/a64-olinuxino/
@@ -912,8 +909,16 @@ F:	board/orangepi/orangepi-prime/
 F:	board/orangepi/orangepi-win/
 F:	board/orangepi/orangepi-zero-plus2/
 F:	board/pine64/
+F:	configs/amarula_a64_relic_defconfig
+F:	configs/amarula_vyasa_rk3288_defconfig
+F:	configs/asus_tinker_rk3288_defconfig
 F:	configs/bananapi_m1_defconfig
 F:	configs/bananapi_m64_defconfig
+F:	configs/engicam_imx6qdl_icore_defconfig
+F:	configs/engicam_imx6qdl_icore_qt5_defconfig
+F:	configs/engicam_imx6qdl_icore_rqs_defconfig
+F:	configs/engicam_imx6ul_geam_defconfig
+F:	configs/engicam_imx6ul_isiot_defconfig
 F:	configs/friendlyarm_nanopi_a64_defconfig
 F:	configs/friendlyarm_nanopi_neo2_defconfig
 F:	configs/olimex_a64_olinuxino_defconfig
@@ -923,11 +928,6 @@ F:	configs/orangepi_win_defconfig
 F:	configs/orangepi_zero_plus2_defconfig
 F:	configs/pine64_defconfig
 F:	configs/pine64_sopine_defconfig
-F:	configs/engicam_imx6qdl_icore_defconfig
-F:	configs/engicam_imx6qdl_icore_qt5_defconfig
-F:	configs/engicam_imx6qdl_icore_rqs_defconfig
-F:	configs/engicam_imx6ul_geam_defconfig
-F:	configs/engicam_imx6ul_isiot_defconfig
 
 N:	James Knight <[email protected]>
 F:	package/atkmm/
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/4 board: orangepi: Add Orangepi One Plus support

Add initial support for Orangepi One Plus board
with below features:
- U-Boot 2018.07
- Linux 4.18.0-rc3
- Default packages from buildroot

---
 .gitlab-ci.yml                                 |  1 +
 DEVELOPERS                                     |  2 ++
 board/orangepi/orangepi-one-plus/extlinux.conf |  4 +++
 board/orangepi/orangepi-one-plus/genimage.cfg  | 33 +++++++++++++++++++
 board/orangepi/orangepi-one-plus/post-build.sh |  4 +++
 board/orangepi/orangepi-one-plus/readme.txt    | 37 ++++++++++++++++++++++
 configs/orangepi_one_plus_defconfig            | 44 ++++++++++++++++++++++++++
 7 files changed, 125 insertions(+)
 create mode 100644 board/orangepi/orangepi-one-plus/extlinux.conf
 create mode 100644 board/orangepi/orangepi-one-plus/genimage.cfg
 create mode 100755 board/orangepi/orangepi-one-plus/post-build.sh
 create mode 100644 board/orangepi/orangepi-one-plus/readme.txt
 create mode 100644 configs/orangepi_one_plus_defconfig
.gitlab-ci.yml +1 -0
index 994e78c..a90577e 100644
@@ -180,6 +180,7 @@ olimex_imx233_olinuxino_defconfig: *defconfig
 openblocks_a6_defconfig: *defconfig
 orangepi_lite_defconfig: *defconfig
 orangepi_one_defconfig: *defconfig
+orangepi_one_plus_defconfig: *defconfig
 orangepi_pc2_defconfig: *defconfig
 orangepi_pc_defconfig: *defconfig
 orangepi_pc_plus_defconfig: *defconfig
DEVELOPERS +2 -0
index a4c1297..cb8ed90 100644
@@ -904,6 +904,7 @@ F:	board/engicam/
 F:	board/friendlyarm/nanopi-a64/
 F:	board/friendlyarm/nanopi-neo2/
 F:	board/olimex/a64-olinuxino/
+F:	board/orangepi/orangepi-one-plus
 F:	board/orangepi/orangepi-pc2/
 F:	board/orangepi/orangepi-prime/
 F:	board/orangepi/orangepi-win/
@@ -922,6 +923,7 @@ F:	configs/engicam_imx6ul_isiot_defconfig
 F:	configs/friendlyarm_nanopi_a64_defconfig
 F:	configs/friendlyarm_nanopi_neo2_defconfig
 F:	configs/olimex_a64_olinuxino_defconfig
+F:	configs/orangepi_one_plus_defconfig
 F:	configs/orangepi_pc2_defconfig
 F:	configs/orangepi_prime_defconfig
 F:	configs/orangepi_win_defconfig
board/orangepi/orangepi-one-plus/extlinux.conf new file +4 -0
new file mode 100644
index 0000000..eae3284
@@ -0,0 +1,4 @@
+label linux-4.18.0-rc3
+  kernel /Image
+  devicetree /sun50i-h6-orangepi-one-plus.dtb
+  append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
board/orangepi/orangepi-one-plus/genimage.cfg new file +33 -0
new file mode 100644
index 0000000..ebb07e8
@@ -0,0 +1,33 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-h6-orangepi-one-plus.dtb",
+			"extlinux"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
board/orangepi/orangepi-one-plus/post-build.sh new file +4 -0
new file mode 100755
index 0000000..ec20fca
@@ -0,0 +1,4 @@
+#!/bin/sh
+BOARD_DIR="$(dirname $0)"
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf
board/orangepi/orangepi-one-plus/readme.txt new file +37 -0
new file mode 100644
index 0000000..87f6de8
@@ -0,0 +1,37 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Orangepi One Plus. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Orangepi One Plus link:
+http://www.orangepi.org/OrangePiOneplus/
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+One+Plus
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make orangepi_one_plus_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your Orangepi One Plus and power it up. The console
+is on the serial line, 115200 8N1.
configs/orangepi_one_plus_defconfig new file +44 -0

44 lines not on this page · raw message

Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 3/4 configs: bpi-m64: Use Mainline ARM ATF

In reply to Jagan Teki

Use Mainline ARM ATF for bananapi-m64 board instead Andre's github.

Cc Andre Przywara <[email protected]>
---
 configs/bananapi_m64_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
configs/bananapi_m64_defconfig +3 -3
index 7d1ed18..db39903 100644
@@ -8,9 +8,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="cffb00342897ed73a2bb9fc7a1860102bd927f2e"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/4 configs: bpi-m64: Use Mainline ARM ATF

Hi,

Quoted 2 lines · Jagan Teki

Use Mainline ARM ATF for bananapi-m64 board instead Andre's github.

Have you tested it? The mainline ATF is not feature-complete yet, so in comparison to the old port you are missing the PMIC setup. This breaks power off and, more importantly, Ethernet support in U-Boot. I have some code to introduce proper (even better) PMIC support, just didn't come around to clean it up and post it.
Meanwhile I would suggest to stick to the old port - actually this was the reason I didn't advertise this more widely yet.

Cheers,
Andre.

Quoted 25 lines
Cc Andre Przywara <[email protected]>
---
 configs/bananapi_m64_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
configs/bananapi_m64_defconfig +3 -3
index 7d1ed18..db39903 100644
@@ -8,9 +8,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="cffb00342897ed73a2bb9fc7a1860102bd927f2e"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
author
#4 lore raw

PATCH 3/4 configs: bpi-m64: Use Mainline ARM ATF

Quoted 6 lines · Andre Przywara

Hi,

Quoted 2 lines · Jagan Teki

Use Mainline ARM ATF for bananapi-m64 board instead Andre's github.

Quoted 7 lines

Have you tested it? The mainline ATF is not feature-complete yet, so in comparison to the old port you are missing the PMIC setup. This breaks power off and, more importantly, Ethernet support in U-Boot. I have some code to introduce proper (even better) PMIC support, just didn't come around to clean it up and post it.
Meanwhile I would suggest to stick to the old port - actually this was the reason I didn't advertise this more widely yet.

I did the basic sanity, look fine. but anyway will drop based on your inputs.

Jagan.

#5 lore raw

PATCH 3/4 configs: bpi-m64: Use Mainline ARM ATF

In reply to Andre Przywara

Hello,

Quoted 6 lines · Andre Przywara

Hi,

Quoted 2 lines · Jagan Teki

Use Mainline ARM ATF for bananapi-m64 board instead Andre's github.

Quoted 7 lines

Have you tested it? The mainline ATF is not feature-complete yet, so in comparison to the old port you are missing the PMIC setup. This breaks power off and, more importantly, Ethernet support in U-Boot. I have some code to introduce proper (even better) PMIC support, just didn't come around to clean it up and post it.
Meanwhile I would suggest to stick to the old port - actually this was the reason I didn't advertise this more widely yet.

So I guess this comment also applied to the Orangepi One Plus patch (PATCH 2/4) in this series, since it also uses mainline ATF:

+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="cffb00342897ed73a2bb9fc7a1860102bd927f2e" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y

I've marked patches 2 to 4 in this series as Changes Requested.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#6 lore raw

PATCH 4/4 configs: bpi-m64: bump linux, uboot

In reply to Jagan Teki

- Uboot to 2017.15
- Linux to 4.17

---
 configs/bananapi_m64_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/bananapi_m64_defconfig +4 -4
index db39903..b071230 100644
@@ -2,8 +2,8 @@ BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 
-# Linux headers same as kernel, a 4.14 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+# Linux headers same as kernel, a 4.17 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,7 +17,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.15"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
@@ -31,7 +31,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boot.cmd"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-bananapi-m64"
Signature · 1 line
1.9.1
#7 lore raw

PATCH 4/4 configs: bpi-m64: bump linux, uboot

Hi Jagan,

Quoted 24 lines · Jagan Teki

- Uboot to 2017.15
- Linux to 4.17

---
 configs/bananapi_m64_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/bananapi_m64_defconfig +2 -2
index db39903..b071230 100644
@@ -2,8 +2,8 @@ BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 
-# Linux headers same as kernel, a 4.14 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+# Linux headers same as kernel, a 4.17 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y

configs/bananapi_m64_defconfig BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y · line 20

Quoted 5 lines
configs/bananapi_m64_defconfig +1 -1
@@ -17,7 +17,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.15"

I don't think version 2017.15 really exists. I tested, just in case, and got a 404.

Also, out of personal taste, I would put the whole defconfig name in the patch subject, to be more grep-friendly:

- [PATCH 4/4] configs: bpi-m64: bump linux, uboot
+ [PATCH 4/4] configs: bananapi_m64: bump linux, uboot

Regards,

Signature · 1 line
Luca
#8 lore raw

PATCH 4/4 configs: bpi-m64: bump linux, uboot

Hello,

Quoted 2 lines · Luca Ceresoli

- [PATCH 4/4] configs: bpi-m64: bump linux, uboot
+ [PATCH 4/4] configs: bananapi_m64: bump linux, uboot

Nitpicking: I even prefer:

	configs/banapi_m64:

which we use more commonly in Buildroot.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#9 lore raw

PATCH 1/4 DEVELOPERS: Fix file order list maintained by me

In reply to Jagan Teki

Hello Jagan,

Quoted 1 line · Jagan Teki

-F: configs/amarula_a64_relic_defconfig

The support for this board is not merged yet. If you send patches that depend on other patches, you should send them all in a patch series.

But in this case, you should have rather based this patch series on master or next, and not on your branch that contains some unrelated work such as the Amarula A64 Relic board support.

Anyway, I've fixed this up, and applied to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#10 lore raw

PATCH 1/4 DEVELOPERS: Fix file order list maintained by me

Quoted 4 lines · Thomas Petazzoni

Hello Jagan,

On Mon, 3 Sep 2018 10:26:09 +0200, Jagan Teki wrote:

Quoted 8 lines
Quoted 1 line

-F: configs/amarula_a64_relic_defconfig

The support for this board is not merged yet. If you send patches that depend on other patches, you should send them all in a patch series.

But in this case, you should have rather based this patch series on master or next, and not on your branch that contains some unrelated work such as the Amarula A64 Relic board support.

Sorry, I thought this board is mainlined. any further comments on this board?

Quoted 2 lines

Anyway, I've fixed this up, and applied to master. Thanks!

Thanks.

#11 lore raw

PATCH 1/4 DEVELOPERS: Fix file order list maintained by me

Hello,

Quoted 1 line · Jagan Teki

Sorry, I thought this board is mainlined. any further comments on this board?

Not at this point, it needs to be reviewed, just like the other 260 patches we have in our backlog :-/

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com