From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 7 Jan 2016 15:36:32 +0000 (+0100)
Subject: ARM64: zynqmp: Add helper variables for Android boot
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec9f6f02364a18d75f6404dc019b38bc01253294;p=thirdparty%2Fu-boot.git

ARM64: zynqmp: Add helper variables for Android boot

New board variable helps with board identification. Maybe in future
better mechanism can be use.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 11be2ad8071..ab4c8f017d0 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -216,6 +216,8 @@
 	"sdroot1=setenv bootargs $bootargs root=/dev/mmcblk1p2 rw rootwait\0" \
 	"earlycon0=setenv bootargs $bootargs earlycon=cdns,mmio,0xff000000,115200n8\0" \
 	"earlycon1=setenv bootargs $bootargs earlycon=cdns,mmio,0xff001000,115200n8\0" \
+	"android=setenv bootargs $bootargs init=/init androidboot.selinux=disabled androidboot.hardware=$board\0" \
+	"android_debug=run android && setenv bootargs $bootargs video=DP-1:1024x768@60 drm.debug=0xf\0" \
 	"usbhostboot=usb start && load usb 0 $fdt_addr system.dtb && " \
 		     "load usb 0 $kernel_addr Image && " \
 		     "booti $kernel_addr - $fdt_addr\0" \
diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h
index 2cea6a65177..d67bed77712 100644
--- a/include/configs/xilinx_zynqmp_ep.h
+++ b/include/configs/xilinx_zynqmp_ep.h
@@ -34,7 +34,8 @@
 	"kernel_offset=0x400000\0" \
 	"fdt_offset=0x2400000\0" \
 	"kernel_size=0x2000000\0" \
-	"fdt_size=0x80000\0"
+	"fdt_size=0x80000\0" \
+	"board=ep108\0"
 
 #include <configs/xilinx_zynqmp.h>
 
diff --git a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
index 0f258557e69..55b36cb5c06 100644
--- a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
+++ b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
@@ -28,7 +28,8 @@
 	"kernel_offset=0x400000\0" \
 	"fdt_offset=0x2400000\0" \
 	"kernel_size=0x2000000\0" \
-	"fdt_size=0x80000\0"
+	"fdt_size=0x80000\0" \
+	"board=zc1751-dc1\0"
 
 #include <configs/xilinx_zynqmp.h>
 
diff --git a/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h b/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
index 8a3caebd2cc..fd17a0c848e 100644
--- a/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
+++ b/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
@@ -25,7 +25,8 @@
 	"kernel_offset=0x400000\0" \
 	"fdt_offset=0x2400000\0" \
 	"kernel_size=0x2000000\0" \
-	"fdt_size=0x80000\0"
+	"fdt_size=0x80000\0" \
+	"board=zc1751-dc2\0"
 
 #include <configs/xilinx_zynqmp.h>
 
diff --git a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
index 7edd5791819..4d4d26f6db6 100644
--- a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
+++ b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
@@ -27,7 +27,8 @@
 	"kernel_offset=0x400000\0" \
 	"fdt_offset=0x2400000\0" \
 	"kernel_size=0x2000000\0" \
-	"fdt_size=0x80000\0"
+	"fdt_size=0x80000\0" \
+	"board=zc1751-dc5\0"
 
 #include <configs/xilinx_zynqmp.h>
 
diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h
index 42b24927d8a..c7574bc6091 100644
--- a/include/configs/xilinx_zynqmp_zcu102.h
+++ b/include/configs/xilinx_zynqmp_zcu102.h
@@ -51,7 +51,8 @@
 	"kernel_offset=0x180000\0" \
 	"fdt_offset=0x100000\0" \
 	"kernel_size=0x1e00000\0" \
-	"fdt_size=0x80000\0"
+	"fdt_size=0x80000\0" \
+	"board=zcu102\0"
 
 #include <configs/xilinx_zynqmp.h>