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 11be2ad807176d969bda3f815ee88a546a788969..ab4c8f017d098d5f7416ff48801e0e08924127b1 100644 (file)
--- 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 2cea6a65177d3315ffa21f4b4c0d0ee5cbf1dce3..d67bed777120d400b1d84865085708f3dd0b57b6 100644 (file)
--- 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 0f258557e695179fef46c594447ff1305224e7f2..55b36cb5c0687f7c6eb85ef17b6d450d11b03695 100644 (file)
--- 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 8a3caebd2ccb6cb15d9b7bef884543e522dee802..fd17a0c848e18f07e926f8e40048cca4fdedbbe0 100644 (file)
--- 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 7edd5791819390b1c0019122ed737e1c734e4d78..4d4d26f6db64245f081f8b13277c314bf764ef79 100644 (file)
--- 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 42b24927d8aaaa1a7f10b86657fa3b3479dba08d..c7574bc6091d17b68bd60647bc6f66d48ff766fe 100644 (file)
--- 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>