From: Luca Ceresoli Date: Wed, 1 Oct 2014 15:03:44 +0000 (+0200) Subject: freescale/imx6-sabresd: use global patch dir for U-Boot patches X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cb8ceb7857727a24e53b52b111d4119d1ecfc5c8;p=buildroot.git freescale/imx6-sabresd: use global patch dir for U-Boot patches The best practice is to use the BR2_GLOBAL_PATCH_DIR for patches against U-Boot, not BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR. Signed-off-by: Luca Ceresoli Tested-by: Vincent Stehlé Cc: Gilles Talis Cc: Gary Bisson Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- diff --git a/board/freescale/imx6sabresd/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch b/board/freescale/imx6sabresd/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch new file mode 100644 index 0000000000..c01df4e6e5 --- /dev/null +++ b/board/freescale/imx6sabresd/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch @@ -0,0 +1,36 @@ +From 4a7cd7c5b165317dccf45cfc235da3e14bc339e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 12 Aug 2014 10:17:31 +0200 +Subject: [PATCH] mx6qsabre_common: boot Linux to /init in mfgtools mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Buildroot supplies a nice /init wrapper script to use when booting from a +ramdisk. + +This patch tells u-boot to tell the kernel to boot into /init (instead of +/linuxrc) on i.MX6, when booting in mfgtools mode. This way we can boot a +buildroot system entirely through USB. + +Signed-off-by: Vincent Stehlé +--- + include/configs/mx6qsabre_common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h +index 69ff0df..ec7b665 100644 +--- a/include/configs/mx6qsabre_common.h ++++ b/include/configs/mx6qsabre_common.h +@@ -129,7 +129,7 @@ + + #define CONFIG_MFG_ENV_SETTINGS \ + "mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \ +- "rdinit=/linuxrc " \ ++ "rdinit=/init " \ + "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ + "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ + "g_mass_storage.iSerialNumber=\"\" "\ +-- +2.0.1 + diff --git a/board/freescale/imx6sabresd/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch b/board/freescale/imx6sabresd/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch deleted file mode 100644 index c01df4e6e5..0000000000 --- a/board/freescale/imx6sabresd/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4a7cd7c5b165317dccf45cfc235da3e14bc339e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= -Date: Tue, 12 Aug 2014 10:17:31 +0200 -Subject: [PATCH] mx6qsabre_common: boot Linux to /init in mfgtools mode -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Buildroot supplies a nice /init wrapper script to use when booting from a -ramdisk. - -This patch tells u-boot to tell the kernel to boot into /init (instead of -/linuxrc) on i.MX6, when booting in mfgtools mode. This way we can boot a -buildroot system entirely through USB. - -Signed-off-by: Vincent Stehlé ---- - include/configs/mx6qsabre_common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h -index 69ff0df..ec7b665 100644 ---- a/include/configs/mx6qsabre_common.h -+++ b/include/configs/mx6qsabre_common.h -@@ -129,7 +129,7 @@ - - #define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \ -- "rdinit=/linuxrc " \ -+ "rdinit=/init " \ - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ - "g_mass_storage.iSerialNumber=\"\" "\ --- -2.0.1 - diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 62caf799b2..b8c4b22bb5 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -2,6 +2,9 @@ BR2_arm=y BR2_cortex_a9=y +# patches +BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabresd/patches" + # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -25,4 +28,3 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga" -BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="board/freescale/imx6sabresd" diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index bc0aa46a59..40a9384d56 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -2,6 +2,9 @@ BR2_arm=y BR2_cortex_a9=y +# patches +BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabresd/patches" + # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -25,4 +28,3 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga" -BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="board/freescale/imx6sabresd"