path: root/board/nexbox
diff options
authorGravatar Peter Korsgaard <peter@korsgaard.com>2017-07-12 14:23:22 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-12 18:38:32 +0200
commit80dacdaa47e7f985506e0085d5e015f41fa0bef3 (patch)
tree32e0c3eb7cab1766e87819bbc5562090a4303add /board/nexbox
parent2c6222c04327da94b2a19f9984d94ee16a1a3320 (diff)
configs: nexbox_a95x_defconfig: bump to kernel 4.12
Main difference is that the drm driver now supports the hdmi output. The gxl variant device tree has been renamed in: commit 7eea67101b9713ae438955e8899b3c4b078419f9 Author: Kevin Hilman <khilman@baylibre.com> Date: Fri Jan 20 07:57:52 2017 -0800 ARM64: dts: meson-gxl: rename Nexbox A95x for consistency Since the GXL family has S905X and S905D SoCs, we're keeping the SoC name in the DTS filename for clarity. Rename this file accordingly to be consistent with the rest of the GXL DTS files. Cc: Neil Armstrong <narmstrong@baylibre.com> Reviewed-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Kevin Hilman <khilman@baylibre.com> So adjust the defconfig and boot script to match. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'board/nexbox')
2 files changed, 2 insertions, 2 deletions
diff --git a/board/nexbox/a95x/boot.txt b/board/nexbox/a95x/boot.txt
index b538b4a9ab..f388ba814a 100644
--- a/board/nexbox/a95x/boot.txt
+++ b/board/nexbox/a95x/boot.txt
@@ -3,7 +3,7 @@ setenv bootargs console=ttyAML0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait
fatload mmc 0:1 0x01080000 uImage
if itest.s "${aml_dt}" == "gxl_p212_2g"; then
- fatload mmc 0:1 $dtb_mem_addr meson-gxl-nexbox-a95x.dtb
+ fatload mmc 0:1 $dtb_mem_addr meson-gxl-s905x-nexbox-a95x.dtb
fatload mmc 0:1 $dtb_mem_addr meson-gxbb-nexbox-a95x.dtb
diff --git a/board/nexbox/a95x/genimage.cfg b/board/nexbox/a95x/genimage.cfg
index c6c80f860b..74e2d3a6f9 100644
--- a/board/nexbox/a95x/genimage.cfg
+++ b/board/nexbox/a95x/genimage.cfg
@@ -3,7 +3,7 @@ image boot.vfat {
files = {
- "meson-gxl-nexbox-a95x.dtb",
+ "meson-gxl-s905x-nexbox-a95x.dtb",