From a244dcdcd45c0b55023095fb6cc3e5dcc0e090b6 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 27 Jul 2016 18:33:40 +0930 Subject: Move to u-boot v2016.07-aspeed-openbmc branch This moves all machines to a new u-boot branch. The u-boot branch is based on this month's upstream v2016.07 release, and contains cleanups that get us closer to submitting upstream. Importantly for the machine configurations, we now have four new defconfigs that replace the previous targets: - ast_g4_ncsi_defconfig: ast2400 with NCSI networking - ast_g4_phy_defconfig: ast2400 with directly attached PHY networking - ast_g5_ncsi_defconfig: ast2500 with NCSI networking - ast_g5_phy_defconfig: ast2500 with directly attached PHY networking We now support Firestone again with the ast_g4_phy_defconfig. This commit updates all machines to the new branch and defconfig. It also removes unused patches that were being made to u-boot, in the case of barreleye (a patch to aspeednic.c) and palmetto (a modification to the u-boot environment). Change-Id: Ic4baf9ae0d5f4046e69cab99d54865771b01cd2a Signed-off-by: Joel Stanley --- .../recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb | 46 ---------------------- .../recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb | 46 ++++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb | 29 -------------- .../recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb | 29 ++++++++++++++ .../common/recipes-bsp/u-boot/u-boot_2016.05.bb | 12 ------ .../common/recipes-bsp/u-boot/u-boot_2016.07.bb | 10 +++++ 6 files changed, 85 insertions(+), 87 deletions(-) delete mode 100644 meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb create mode 100644 meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb delete mode 100644 meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb create mode 100644 meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb delete mode 100644 meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb create mode 100644 meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb (limited to 'meta-phosphor/common/recipes-bsp') diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb deleted file mode 100644 index c24023641..000000000 --- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" -SECTION = "bootloader" -DEPENDS = "mtd-utils" - -SRCREV = "3f04d9fef7bbfec3a536337e7fc1b3492d20e331" -UBRANCH = "v2016.05-aspeed-openbmc" -SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" - -PV = "v2016.05+git${SRCPV}" - -S = "${WORKDIR}/git" - -INSANE_SKIP_${PN} = "already-stripped" -EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' -EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' - -inherit uboot-config - -do_compile () { - oe_runmake ${UBOOT_MACHINE} - oe_runmake env -} - -do_install () { - install -d ${D}${base_sbindir} - install -d ${D}${sysconfdir} - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv - install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config -} - -do_install_class-cross () { - install -d ${D}${bindir_cross} - install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv - install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv -} - -SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross" -uboot_fw_utils_cross() { - sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -BBCLASSEXTEND = "cross" diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb new file mode 100644 index 000000000..eb89efcce --- /dev/null +++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb @@ -0,0 +1,46 @@ +SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" +SECTION = "bootloader" +DEPENDS = "mtd-utils" + +SRCREV = "f9b2a49f57c153c7358f9769234c0cefdf4de8d4" +UBRANCH = "v2016.07-aspeed-openbmc" +SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" + +PV = "v2016.07+git${SRCPV}" + +S = "${WORKDIR}/git" + +INSANE_SKIP_${PN} = "already-stripped" +EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' +EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' + +inherit uboot-config + +do_compile () { + oe_runmake ${UBOOT_MACHINE} + oe_runmake env +} + +do_install () { + install -d ${D}${base_sbindir} + install -d ${D}${sysconfdir} + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv + install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config +} + +do_install_class-cross () { + install -d ${D}${bindir_cross} + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv +} + +SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross" +uboot_fw_utils_cross() { + sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "cross" diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb deleted file mode 100644 index 27ed1314b..000000000 --- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "U-Boot bootloader image creation tool" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" -SECTION = "bootloader" - -DEPENDS = "openssl" - -SRCREV = "47441cc36bb8e919a066837e4d7c5a8a1c475da4" -UBRANCH = "v2016.05-ast2500" -SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" - -PV = "v2016.05+git${SRCPV}" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' - -do_compile () { - oe_runmake sandbox_defconfig - oe_runmake cross_tools NO_SDL=1 -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage - ln -sf uboot-mkimage ${D}${bindir}/mkimage -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb new file mode 100644 index 000000000..0fece5441 --- /dev/null +++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb @@ -0,0 +1,29 @@ +SUMMARY = "U-Boot bootloader image creation tool" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" +SECTION = "bootloader" + +DEPENDS = "openssl" + +SRCREV = "f9b2a49f57c153c7358f9769234c0cefdf4de8d4" +UBRANCH = "v2016.07-aspeed-openbmc" +SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" + +PV = "v2016.07+git${SRCPV}" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' + +do_compile () { + oe_runmake sandbox_defconfig + oe_runmake cross_tools NO_SDL=1 +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage + ln -sf uboot-mkimage ${D}${bindir}/mkimage +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb deleted file mode 100644 index bb97e8ba2..000000000 --- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb +++ /dev/null @@ -1,12 +0,0 @@ -require recipes-bsp/u-boot/u-boot.inc - -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" -DEPENDS += "dtc-native" - -SRCREV = "3f04d9fef7bbfec3a536337e7fc1b3492d20e331" -UBRANCH = "v2016.05-aspeed-openbmc" -SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" - -PV = "v2016.05+git${SRCPV}" - -EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline" diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb new file mode 100644 index 000000000..9db0b1155 --- /dev/null +++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb @@ -0,0 +1,10 @@ +require recipes-bsp/u-boot/u-boot.inc + +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" +DEPENDS += "dtc-native" + +SRCREV = "f9b2a49f57c153c7358f9769234c0cefdf4de8d4" +UBRANCH = "v2016.07-aspeed-openbmc" +SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" + +PV = "v2016.07+git${SRCPV}" -- cgit v1.2.1