diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-bsp/u-boot')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch | 28 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch | 14 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc (renamed from import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2017.09.inc) | 3 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb (renamed from import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.09.bb) | 0 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb (renamed from import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.09.bb) | 2 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2018.01.bb (renamed from import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2017.09.bb) | 0 |
6 files changed, 10 insertions, 37 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch deleted file mode 100644 index 841953cd1..000000000 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch +++ /dev/null @@ -1,28 +0,0 @@ -Nios II for MAX10 10m50 board requires update to -its device tree to enable CPU driver during -u-boot pre-relocation. This patch tag the CPU -with dm-pre-reloc flag. - -Upstream-Status: Submitted - -Signed-off-by: Gan, Yau Wai <yau.wai.gan@intel.com> - ---- - arch/nios2/dts/10m50_devboard.dts | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/nios2/dts/10m50_devboard.dts b/arch/nios2/dts/10m50_devboard.dts -index 05eac30..461ae68 100644 ---- a/arch/nios2/dts/10m50_devboard.dts -+++ b/arch/nios2/dts/10m50_devboard.dts -@@ -19,6 +19,7 @@ - #size-cells = <0>; - - cpu: cpu@0 { -+ u-boot,dm-pre-reloc; - device_type = "cpu"; - compatible = "altr,nios2-1.1"; - reg = <0x00000000>; --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch index cea52b79e..ecaa1796a 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch +++ b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch @@ -5,15 +5,15 @@ Upstream-Status: Pending Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> -diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig -index 4e2b705..b02ab1f 100644 ---- a/configs/MPC8315ERDB_defconfig -+++ b/configs/MPC8315ERDB_defconfig -@@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y - CONFIG_CMD_I2C=y +Index: git/configs/MPC8315ERDB_defconfig +=================================================================== +--- git.orig/configs/MPC8315ERDB_defconfig ++++ git/configs/MPC8315ERDB_defconfig +@@ -12,6 +12,7 @@ CONFIG_CMD_PCI=y + CONFIG_CMD_SATA=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y - CONFIG_CMD_EXT2=y + CONFIG_CMD_DATE=y diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2017.09.inc b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc index 02e51242c..d2073ea0c 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2017.09.inc +++ b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc @@ -7,11 +7,10 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "c98ac3487e413c71e5d36322ef3324b21c6f60f9" +SRCREV = "f3dd87e0b98999a78e500e8c6d2b063ebadf535a" SRC_URI = "git://git.denx.de/u-boot.git \ file://MPC8315ERDB-enable-DHCP.patch \ - file://10m50-update-device-tree.patch \ " S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.09.bb b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb index 02887a138..02887a138 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.09.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.09.bb b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb index f1fc56449..1c008be96 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.09.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb @@ -24,4 +24,6 @@ do_install () { ln -sf uboot-mkimage ${D}${bindir}/mkimage } +RDEPENDS_${PN} += "dtc" + BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2017.09.bb b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2018.01.bb index 37c21dcaa..37c21dcaa 100644 --- a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2017.09.bb +++ b/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2018.01.bb |