From e1270e1193548cf41a8915e8b6da35d6db51d160 Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Fri, 17 Jan 2014 13:56:46 -0600 Subject: at91bootstrap-3.5.3: use same patch for mtocgd, mtocgd3 --- .../at91bootstrap-3.5.3-mtocgd.patch | 60 ++++++++++++++++++++++ .../mtocgd/at91bootstrap-3.5.3-mtocgd.patch | 60 ---------------------- .../mtocgd3/at91bootstrap-3.5.3-mtocgd3.patch | 60 ---------------------- .../recipes/at91bootstrap/at91bootstrap_3.5.3.bb | 5 +- 4 files changed, 62 insertions(+), 123 deletions(-) create mode 100644 multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/at91bootstrap-3.5.3-mtocgd.patch delete mode 100644 multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd/at91bootstrap-3.5.3-mtocgd.patch delete mode 100644 multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd3/at91bootstrap-3.5.3-mtocgd3.patch diff --git a/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/at91bootstrap-3.5.3-mtocgd.patch b/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/at91bootstrap-3.5.3-mtocgd.patch new file mode 100644 index 0000000..313bd91 --- /dev/null +++ b/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/at91bootstrap-3.5.3-mtocgd.patch @@ -0,0 +1,60 @@ +Index: at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig +=================================================================== +--- at91bootstrap-3.5.3.orig/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig 2013-04-11 05:07:35.000000000 -0500 ++++ at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig 2013-04-29 15:13:01.390913836 -0500 +@@ -42,7 +42,8 @@ + ALLOW_PIO3=y + CONFIG_HAS_PIO3=y + CPU_HAS_PMECC=y +-CONFIG_LOAD_ONE_WIRE=y ++# MTS: don't load one wire ++# CONFIG_LOAD_ONE_WIRE is not set + # CONFIG_MMC_SUPPORT is not set + + # +@@ -81,8 +82,8 @@ + # + # PMECC Configuration + # +-CONFIG_PMECC_CORRECT_BITS_2=y +-# CONFIG_PMECC_CORRECT_BITS_4 is not set ++# CONFIG_PMECC_CORRECT_BITS_2 is not set ++CONFIG_PMECC_CORRECT_BITS_4=y + # CONFIG_PMECC_CORRECT_BITS_8 is not set + # CONFIG_PMECC_CORRECT_BITS_12 is not set + # CONFIG_PMECC_CORRECT_BITS_24 is not set +@@ -116,4 +117,5 @@ + # CONFIG_USER_HW_INIT is not set + CONFIG_THUMB=y + CONFIG_SCLK=y +-CONFIG_DISABLE_WATCHDOG=y ++# MTS: don't disable watchdog ++# CONFIG_DISABLE_WATCHDOG is not set +Index: at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5ek.c +=================================================================== +--- at91bootstrap-3.5.3.orig/board/at91sam9x5ek/at91sam9x5ek.c 2013-04-11 05:07:35.000000000 -0500 ++++ at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5ek.c 2013-04-29 15:14:44.578915819 -0500 +@@ -312,10 +312,8 @@ + + reg = readl(AT91C_BASE_CCFG + CCFG_EBICSA); + reg |= AT91C_EBI_CS3A_SM; +- if (get_cm_rev() == 'A') +- reg &= ~AT91C_EBI_NFD0_ON_D16; +- else +- reg |= (AT91C_EBI_DDR_MP_EN | AT91C_EBI_NFD0_ON_D16); ++ /* MTR */ ++ reg |= (AT91C_EBI_DDR_MP_EN | AT91C_EBI_NFD0_ON_D16); + + reg &= ~AT91C_EBI_DRV; + writel(reg, AT91C_BASE_CCFG + CCFG_EBICSA); +@@ -345,9 +343,7 @@ + AT91C_BASE_SMC + SMC_CTRL3); + + /* Configure the PIO controller */ +- if (get_cm_rev() == 'A') +- pio_configure(nand_pins_lo); +- else ++ /* MTR2 */ + pio_configure(nand_pins_hi); + + writel((1 << AT91C_ID_PIOC_D), (PMC_PCER + AT91C_BASE_PMC)); diff --git a/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd/at91bootstrap-3.5.3-mtocgd.patch b/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd/at91bootstrap-3.5.3-mtocgd.patch deleted file mode 100644 index 313bd91..0000000 --- a/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd/at91bootstrap-3.5.3-mtocgd.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig -=================================================================== ---- at91bootstrap-3.5.3.orig/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig 2013-04-11 05:07:35.000000000 -0500 -+++ at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig 2013-04-29 15:13:01.390913836 -0500 -@@ -42,7 +42,8 @@ - ALLOW_PIO3=y - CONFIG_HAS_PIO3=y - CPU_HAS_PMECC=y --CONFIG_LOAD_ONE_WIRE=y -+# MTS: don't load one wire -+# CONFIG_LOAD_ONE_WIRE is not set - # CONFIG_MMC_SUPPORT is not set - - # -@@ -81,8 +82,8 @@ - # - # PMECC Configuration - # --CONFIG_PMECC_CORRECT_BITS_2=y --# CONFIG_PMECC_CORRECT_BITS_4 is not set -+# CONFIG_PMECC_CORRECT_BITS_2 is not set -+CONFIG_PMECC_CORRECT_BITS_4=y - # CONFIG_PMECC_CORRECT_BITS_8 is not set - # CONFIG_PMECC_CORRECT_BITS_12 is not set - # CONFIG_PMECC_CORRECT_BITS_24 is not set -@@ -116,4 +117,5 @@ - # CONFIG_USER_HW_INIT is not set - CONFIG_THUMB=y - CONFIG_SCLK=y --CONFIG_DISABLE_WATCHDOG=y -+# MTS: don't disable watchdog -+# CONFIG_DISABLE_WATCHDOG is not set -Index: at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5ek.c -=================================================================== ---- at91bootstrap-3.5.3.orig/board/at91sam9x5ek/at91sam9x5ek.c 2013-04-11 05:07:35.000000000 -0500 -+++ at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5ek.c 2013-04-29 15:14:44.578915819 -0500 -@@ -312,10 +312,8 @@ - - reg = readl(AT91C_BASE_CCFG + CCFG_EBICSA); - reg |= AT91C_EBI_CS3A_SM; -- if (get_cm_rev() == 'A') -- reg &= ~AT91C_EBI_NFD0_ON_D16; -- else -- reg |= (AT91C_EBI_DDR_MP_EN | AT91C_EBI_NFD0_ON_D16); -+ /* MTR */ -+ reg |= (AT91C_EBI_DDR_MP_EN | AT91C_EBI_NFD0_ON_D16); - - reg &= ~AT91C_EBI_DRV; - writel(reg, AT91C_BASE_CCFG + CCFG_EBICSA); -@@ -345,9 +343,7 @@ - AT91C_BASE_SMC + SMC_CTRL3); - - /* Configure the PIO controller */ -- if (get_cm_rev() == 'A') -- pio_configure(nand_pins_lo); -- else -+ /* MTR2 */ - pio_configure(nand_pins_hi); - - writel((1 << AT91C_ID_PIOC_D), (PMC_PCER + AT91C_BASE_PMC)); diff --git a/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd3/at91bootstrap-3.5.3-mtocgd3.patch b/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd3/at91bootstrap-3.5.3-mtocgd3.patch deleted file mode 100644 index 8b7d82b..0000000 --- a/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd3/at91bootstrap-3.5.3-mtocgd3.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig -=================================================================== ---- at91bootstrap-3.5.3.orig/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig 2013-04-11 05:07:35.000000000 -0500 -+++ at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig 2013-04-29 15:13:01.390913836 -0500 -@@ -42,7 +42,8 @@ - ALLOW_PIO3=y - CONFIG_HAS_PIO3=y - CPU_HAS_PMECC=y --CONFIG_LOAD_ONE_WIRE=y -+# MTS: don't load one wire -+# CONFIG_LOAD_ONE_WIRE is not set - # CONFIG_MMC_SUPPORT is not set - - # -@@ -81,8 +82,8 @@ - # - # PMECC Configuration - # --CONFIG_PMECC_CORRECT_BITS_2=y --# CONFIG_PMECC_CORRECT_BITS_4 is not set -+# CONFIG_PMECC_CORRECT_BITS_2 is not set -+CONFIG_PMECC_CORRECT_BITS_4=y - # CONFIG_PMECC_CORRECT_BITS_8 is not set - # CONFIG_PMECC_CORRECT_BITS_12 is not set - # CONFIG_PMECC_CORRECT_BITS_24 is not set -@@ -116,4 +117,5 @@ - # CONFIG_USER_HW_INIT is not set - CONFIG_THUMB=y - CONFIG_SCLK=y --CONFIG_DISABLE_WATCHDOG=y -+# MTS: don't disable watchdog -+# CONFIG_DISABLE_WATCHDOG is not set -Index: at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5ek.c -=================================================================== ---- at91bootstrap-3.5.3.orig/board/at91sam9x5ek/at91sam9x5ek.c 2013-04-11 05:07:35.000000000 -0500 -+++ at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5ek.c 2013-04-29 15:14:44.578915819 -0500 -@@ -312,10 +312,8 @@ - - reg = readl(AT91C_BASE_CCFG + CCFG_EBICSA); - reg |= AT91C_EBI_CS3A_SM; -- if (get_cm_rev() == 'A') -- reg &= ~AT91C_EBI_NFD0_ON_D16; -- else -- reg |= (AT91C_EBI_DDR_MP_EN | AT91C_EBI_NFD0_ON_D16); -+ /* MTR */ -+ reg |= (AT91C_EBI_DDR_MP_EN | AT91C_EBI_NFD0_ON_D16); - - reg &= ~AT91C_EBI_DRV; - writel(reg, AT91C_BASE_CCFG + CCFG_EBICSA); -@@ -345,9 +343,7 @@ - AT91C_BASE_SMC + SMC_CTRL3); - - /* Configure the PIO controller */ -- if (get_cm_rev() == 'A') -- pio_configure(nand_pins_lo); -- else -+ /* MTR */ - pio_configure(nand_pins_hi); - - writel((1 << AT91C_ID_PIOC_D), (PMC_PCER + AT91C_BASE_PMC)); diff --git a/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb b/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb index a7b0643..59e088c 100644 --- a/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb +++ b/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb @@ -7,9 +7,8 @@ SRC_URI = "https://github.com/linux4sam/at91bootstrap/archive/v3.5.3.tar.gz \ file://at91bootstrap-3.5.2-onetime-slow-clock-switch.patch \ file://at91sam9x5_4bit_pmecc_header.bin " -SRC_URI_append_mtocgd3 = " file://at91bootstrap-3.5.3-mtocgd3.patch " - -SRC_URI_append_mtocgd = " file://at91bootstrap-3.5.3-mtocgd.patch " +SRC_URI_append_mtocgd3 = " file://at91bootstrap-3.5.3-mtocgd.patch " +SRC_URI_append_mtocgd = " file://at91bootstrap-3.5.3-mtocgd.patch " SRC_URI[md5sum] = "7379726f686f5b9c8f4a2012676b79fc" SRC_URI[sha256sum] = "6c2289671f1c3cf317114b2e82955f98e860dda8c706d5c1e80c0bbebc6c5b12" -- cgit v1.2.3