diff options
| author | Nathan Rossi <nathan@nathanrossi.com> | 2018-08-28 13:52:08 +1000 |
|---|---|---|
| committer | Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | 2019-01-01 20:03:46 -0800 |
| commit | 040f8ee5d3ebee463a99a3d421905914fa280278 (patch) | |
| tree | 42531eefb3a6e1fb1b318e5cfd9f0c9225117cc5 /meta-xilinx-contrib/conf | |
| parent | ecc7f7eb933269d18f37ca207fb4022f8d78ae39 (diff) | |
| download | meta-xilinx-040f8ee5d3ebee463a99a3d421905914fa280278.tar.gz | |
meta-xilinx-contrib/u-boot: Remove minized appends
The minized board is supported in the v2018.07 of u-boot which is the
default provided by oe-core/meta. This includes all the configuration
provided by the patch.
Note however that neither upstream u-boot nor the patch in
meta-xilinx-contrib provided ps7 init files for this board which makes
the HAS_PLATFORM_INIT incorrect, as it will result in a boot.bin being
built which does not include ps7 init configuration and thus will not
boot correctly. As such this change also removes the boot.bin setup and
use in the machine configuration to prevent the dependency on platform
init files which are not available.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Diffstat (limited to 'meta-xilinx-contrib/conf')
| -rw-r--r-- | meta-xilinx-contrib/conf/machine/minized-zynq7.conf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf index 2f55c787..5bacdd50 100644 --- a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf +++ b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf | |||
| @@ -11,11 +11,9 @@ MACHINE_FEATURES = "ext2 vfat usbhost wifi bluetooth" | |||
| 11 | # u-boot configuration | 11 | # u-boot configuration |
| 12 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" | 12 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" |
| 13 | UBOOT_MACHINE = "zynq_minized_config" | 13 | UBOOT_MACHINE = "zynq_minized_config" |
| 14 | SPL_BINARY = "spl/boot.bin" | ||
| 15 | 14 | ||
| 16 | EXTRA_IMAGEDEPENDS += " \ | 15 | EXTRA_IMAGEDEPENDS += " \ |
| 17 | u-boot-zynq-uenv \ | 16 | u-boot-zynq-uenv \ |
| 18 | virtual/boot-bin \ | ||
| 19 | " | 17 | " |
| 20 | 18 | ||
| 21 | SERIAL_CONSOLE = "115200 ttyPS0" | 19 | SERIAL_CONSOLE = "115200 ttyPS0" |
| @@ -26,7 +24,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" | |||
| 26 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" | 24 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" |
| 27 | 25 | ||
| 28 | IMAGE_BOOT_FILES += " \ | 26 | IMAGE_BOOT_FILES += " \ |
| 29 | boot.bin \ | ||
| 30 | devicetree/${MACHINE}.dtb \ | 27 | devicetree/${MACHINE}.dtb \ |
| 31 | uEnv.txt \ | 28 | uEnv.txt \ |
| 32 | " | 29 | " |
