diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/u-boot-imx6/Makefile (renamed from package/u-boot-cubox-i/Makefile) | 22 | ||||
| -rw-r--r-- | package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h | 52 |
2 files changed, 64 insertions, 10 deletions
diff --git a/package/u-boot-cubox-i/Makefile b/package/u-boot-imx6/Makefile index 7a32a179e..032c08c52 100644 --- a/package/u-boot-cubox-i/Makefile +++ b/package/u-boot-imx6/Makefile @@ -3,20 +3,22 @@ include $(TOPDIR)/rules.mk -PKG_NAME:= u-boot-cubox-i -PKG_VERSION:= 2014.02.16 +PKG_NAME:= u-boot-imx6 +PKG_VERSION:= 20140416 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6f8809f69df21fc2ff1cc692aca82939 -PKG_DESCR:= bootloader for cubox-i (imx6) +PKG_MD5SUM:= f2a5f697670c340eef8074f6a5f26476 +PKG_DESCR:= bootloader for imx6 (cubox-i) PKG_SECTION:= boot -PKG_URL:= https://github.com/rabeeh/u-boot-imx6.git +PKG_URL:= https://github.com/SolidRun/u-boot-imx6.git PKG_SITES:= http://openadk.org/distfiles/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SYSTEM_DEPENDS:= cubox-i include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,U_BOOT_CUBOX_I,u-boot-cubox-i,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,U_BOOT_IMX6,u-boot-imx6,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual XAKE_FLAGS+= GCC_HONOUR_COPTS=s @@ -27,9 +29,9 @@ INSTALL_STYLE:= manual do-configure: cd ${WRKBUILD}; $(MAKE) mx6_cubox-i_config -u-boot-cubox-i-install: - $(INSTALL_DIR) ${WRKINST}/boot - $(CP) ${WRKBUILD}/SPL ${WRKINST}/boot - $(CP) ${WRKBUILD}/u-boot.img ${WRKINST}/boot +u-boot-imx6-install: + $(INSTALL_DIR) ${FW_DIR} + $(CP) ${WRKBUILD}/SPL ${FW_DIR} + $(CP) ${WRKBUILD}/u-boot.img ${FW_DIR} include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h b/package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h new file mode 100644 index 000000000..8724ec7c1 --- /dev/null +++ b/package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h @@ -0,0 +1,52 @@ +--- u-boot-imx6-20140416.orig/include/configs/mx6_cubox-i.h 2014-04-17 15:53:51.000000000 +0200 ++++ u-boot-imx6-20140416/include/configs/mx6_cubox-i.h 2014-04-22 11:45:28.117832106 +0200 +@@ -171,7 +171,7 @@ + "ip_dyn=yes\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ + "mmcpart=1\0" \ +- "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ ++ "mmcroot=/dev/mmcblk0p1 rootwait rw\0" \ + "update_sd_firmware_filename=u-boot.imx\0" \ + "update_sd_firmware=" \ + "if test ${ip_dyn} = yes; then " \ +@@ -212,19 +212,19 @@ + "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ + "env import -t ${loadaddr} ${filesize};\0" \ + "autobootfdt=echo Booting ${boot_file}; " \ +- "if test ${boot_file} = zImage; then " \ ++ "if test ${boot_file} = kernel; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "fi;\0 " \ + "autoboot=echo Booting ${boot_file}; " \ +- "if test ${boot_file} = zImage; then " \ ++ "if test ${boot_file} = kernel; then " \ + "bootz; " \ + "else " \ + "bootm; " \ + "fi;\0 " \ + "bootit=setenv boot_file ${bootfile}; " \ +- "if test ${boot_file} = zImage; then " \ ++ "if test ${boot_file} = kernel; then " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ + "run autobootfdt; " \ +@@ -260,7 +260,7 @@ + "setenv get_cmd tftp; " \ + "fi; " \ + "if test ${bootfile} = auto; then " \ +- "setenv bootfile zImage; " \ ++ "setenv bootfile kernel; " \ + "if ${get_cmd} ${bootfile}; then " \ + "run bootit; " \ + "else " \ +@@ -286,7 +286,7 @@ + "fi; " \ + "if test ${bootfile} = auto; then " \ + "setenv origbootfile auto; " \ +- "setenv bootfile zImage; " \ ++ "setenv bootfile kernel; " \ + "if run loadbootfile; then " \ + "run mmcboot; " \ + "else " \ |