diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-07-10 15:56:59 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-07-10 20:43:43 +0200 |
| commit | 4ac3c7e979e8671df712d2cfd30b1966d09f479d (patch) | |
| tree | 031b8ce97fd7837b82f325e97f10e1fc1cb061fe /conf | |
| parent | 057c3d173949d803c150ffe14338554845fec63c (diff) | |
u-boot-toradex: update to 2019.07 based
Update to a 2019.07 based U-Boot.
Use the openembedded master recipes for u-boot_2019.07 as a base.
While at it append -tk1 to PN to have a name different from the u-boot recipe
name for our NXP based SoM and set the prefered provider accordingly.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/apalis-tk1-mainline.conf | 4 | ||||
| -rw-r--r-- | conf/machine/apalis-tk1.conf | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/machine/apalis-tk1-mainline.conf b/conf/machine/apalis-tk1-mainline.conf index f3aaace..6dfeafa 100644 --- a/conf/machine/apalis-tk1-mainline.conf +++ b/conf/machine/apalis-tk1-mainline.conf @@ -35,7 +35,7 @@ WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" PREFERRED_PROVIDER_u-boot = "u-boot-toradex" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-tk1" UBOOT_MACHINE = "apalis-tk1_defconfig" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" @@ -69,7 +69,7 @@ XSERVER ?= "xserver-xorg \ MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci " MACHINE_EXTRA_RDEPENDS = "linux-firmware-nvidia tdx-k20-fw" -EXTRA_IMAGEDEPENDS += "u-boot" +EXTRA_IMAGEDEPENDS += "virtual/bootloader" # used by sysvinit_2 SERIAL_CONSOLES = "115200;ttyS0" diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf index 2f1f617..0cf6e5c 100644 --- a/conf/machine/apalis-tk1.conf +++ b/conf/machine/apalis-tk1.conf @@ -33,8 +33,8 @@ WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" # The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" -PREFERRED_PROVIDER_u-boot = "u-boot-toradex" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" +PREFERRED_PROVIDER_u-boot = "u-boot-toradex-tk1" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-tk1" UBOOT_MACHINE = "apalis-tk1_defconfig" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" @@ -75,7 +75,7 @@ MACHINE_EXTRA_RDEPENDS = " \ linux-driver-package-firmware \ linux-driver-package-firstboot \ " -EXTRA_IMAGEDEPENDS += "u-boot" +EXTRA_IMAGEDEPENDS += "virtual/bootloader" # used by sysvinit_2 SERIAL_CONSOLES = "115200;ttyS0" |