drop upstreamed i.MX6 Solid Run patch
This commit is contained in:
Peter Robinson
parent
6048e76bc7
commit
d0ecd187b5
@ -1,371 +0,0 @@
|
|||||||
From patchwork Thu Jun 7 13:17:36 2018
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
Subject: [U-Boot,
|
|
||||||
1/2] mx6cuboxi: consolidate board detection and add som revision
|
|
||||||
checking
|
|
||||||
X-Patchwork-Submitter: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
X-Patchwork-Id: 926302
|
|
||||||
Message-Id: <6b1adde9ae6b6208044619cc0f2b5335f9233326.1528377457.git.baruch@tkos.co.il>
|
|
||||||
To: Fabio Estevam <fabio.estevam@nxp.com>,
|
|
||||||
Stefano Babic <sbabic@denx.de>
|
|
||||||
Cc: u-boot@lists.denx.de, Baruch Siach <baruch@tkos.co.il>
|
|
||||||
Date: Thu, 7 Jun 2018 16:17:36 +0300
|
|
||||||
From: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
|
||||||
|
|
||||||
From: Jon Nettleton <jon@solid-run.com>
|
|
||||||
|
|
||||||
In order to properly detect the board the checks need to be done
|
|
||||||
in a specific order. Move these tests back into a single enum
|
|
||||||
function that will always return the proper the board it is checking.
|
|
||||||
|
|
||||||
This also adds the best test we have for detecting the rev 1.5 som,
|
|
||||||
and it simplifies the device-tree filename building.
|
|
||||||
|
|
||||||
Signed-off-by: Jon Nettleton <jon@solid-run.com>
|
|
||||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
|
|
||||||
---
|
|
||||||
board/solidrun/mx6cuboxi/mx6cuboxi.c | 136 +++++++++++++++++----------
|
|
||||||
include/configs/mx6cuboxi.h | 24 ++---
|
|
||||||
2 files changed, 98 insertions(+), 62 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
|
||||||
index 1fb3c69edeb5..1567cf0c91af 100644
|
|
||||||
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
|
||||||
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
|
||||||
@@ -57,6 +57,13 @@ DECLARE_GLOBAL_DATA_PTR;
|
|
||||||
#define ETH_PHY_RESET IMX_GPIO_NR(4, 15)
|
|
||||||
#define USB_H1_VBUS IMX_GPIO_NR(1, 0)
|
|
||||||
|
|
||||||
+enum board_type {
|
|
||||||
+ CUBOXI = 0x00,
|
|
||||||
+ HUMMINGBOARD = 0x01,
|
|
||||||
+ HUMMINGBOARD2 = 0x02,
|
|
||||||
+ UNKNOWN = 0x03,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
int dram_init(void)
|
|
||||||
{
|
|
||||||
gd->ram_size = imx_ddr_size();
|
|
||||||
@@ -77,10 +84,17 @@ static iomux_v3_cfg_t const usdhc2_pads[] = {
|
|
||||||
IOMUX_PADS(PAD_SD2_DAT3__SD2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
|
|
||||||
};
|
|
||||||
|
|
||||||
-static iomux_v3_cfg_t const hb_cbi_sense[] = {
|
|
||||||
+static iomux_v3_cfg_t const board_detect[] = {
|
|
||||||
/* These pins are for sensing if it is a CuBox-i or a HummingBoard */
|
|
||||||
IOMUX_PADS(PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(UART_PAD_CTRL)),
|
|
||||||
IOMUX_PADS(PAD_EIM_DA4__GPIO3_IO04 | MUX_PAD_CTRL(UART_PAD_CTRL)),
|
|
||||||
+ IOMUX_PADS(PAD_SD4_DAT0__GPIO2_IO08 | MUX_PAD_CTRL(UART_PAD_CTRL)),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static iomux_v3_cfg_t const som_rev_detect[] = {
|
|
||||||
+ /* These pins are for sensing if it is a CuBox-i or a HummingBoard */
|
|
||||||
+ IOMUX_PADS(PAD_CSI0_DAT14__GPIO6_IO00 | MUX_PAD_CTRL(UART_PAD_CTRL)),
|
|
||||||
+ IOMUX_PADS(PAD_CSI0_DAT18__GPIO6_IO04 | MUX_PAD_CTRL(UART_PAD_CTRL)),
|
|
||||||
};
|
|
||||||
|
|
||||||
static iomux_v3_cfg_t const usb_pads[] = {
|
|
||||||
@@ -333,88 +347,110 @@ int board_init(void)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static bool is_hummingboard(void)
|
|
||||||
+static enum board_type board_type(void)
|
|
||||||
{
|
|
||||||
- int val1, val2;
|
|
||||||
+ int val1, val2, val3;
|
|
||||||
|
|
||||||
- SETUP_IOMUX_PADS(hb_cbi_sense);
|
|
||||||
-
|
|
||||||
- gpio_direction_input(IMX_GPIO_NR(4, 9));
|
|
||||||
- gpio_direction_input(IMX_GPIO_NR(3, 4));
|
|
||||||
-
|
|
||||||
- val1 = gpio_get_value(IMX_GPIO_NR(4, 9));
|
|
||||||
- val2 = gpio_get_value(IMX_GPIO_NR(3, 4));
|
|
||||||
+ SETUP_IOMUX_PADS(board_detect);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Machine selection -
|
|
||||||
- * Machine val1, val2
|
|
||||||
- * -------------------------
|
|
||||||
- * HB2 x x
|
|
||||||
- * HB rev 3.x x 0
|
|
||||||
- * CBi 0 1
|
|
||||||
- * HB 1 1
|
|
||||||
+ * Machine val1, val2, val3
|
|
||||||
+ * ----------------------------
|
|
||||||
+ * HB2 x x 0
|
|
||||||
+ * HB rev 3.x x 0 x
|
|
||||||
+ * CBi 0 1 x
|
|
||||||
+ * HB 1 1 x
|
|
||||||
*/
|
|
||||||
|
|
||||||
- if (val2 == 0)
|
|
||||||
- return true;
|
|
||||||
- else if (val1 == 0)
|
|
||||||
- return false;
|
|
||||||
- else
|
|
||||||
- return true;
|
|
||||||
-}
|
|
||||||
+ gpio_direction_input(IMX_GPIO_NR(2, 8));
|
|
||||||
+ val3 = gpio_get_value(IMX_GPIO_NR(2, 8));
|
|
||||||
|
|
||||||
-static bool is_hummingboard2(void)
|
|
||||||
-{
|
|
||||||
- int val1;
|
|
||||||
+ if (val3 == 0)
|
|
||||||
+ return HUMMINGBOARD2;
|
|
||||||
|
|
||||||
- SETUP_IOMUX_PADS(hb_cbi_sense);
|
|
||||||
+ gpio_direction_input(IMX_GPIO_NR(3, 4));
|
|
||||||
+ val2 = gpio_get_value(IMX_GPIO_NR(3, 4));
|
|
||||||
|
|
||||||
- gpio_direction_input(IMX_GPIO_NR(2, 8));
|
|
||||||
+ if (val2 == 0)
|
|
||||||
+ return HUMMINGBOARD;
|
|
||||||
|
|
||||||
- val1 = gpio_get_value(IMX_GPIO_NR(2, 8));
|
|
||||||
+ gpio_direction_input(IMX_GPIO_NR(4, 9));
|
|
||||||
+ val1 = gpio_get_value(IMX_GPIO_NR(4, 9));
|
|
||||||
|
|
||||||
- /*
|
|
||||||
- * Machine selection -
|
|
||||||
- * Machine val1
|
|
||||||
- * -------------------
|
|
||||||
- * HB2 0
|
|
||||||
- * HB rev 3.x x
|
|
||||||
- * CBi x
|
|
||||||
- * HB x
|
|
||||||
- */
|
|
||||||
+ if (val1 == 0) {
|
|
||||||
+ return CUBOXI;
|
|
||||||
+ } else {
|
|
||||||
+ return HUMMINGBOARD;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static bool is_rev_15_som(void)
|
|
||||||
+{
|
|
||||||
+ int val1, val2;
|
|
||||||
+ SETUP_IOMUX_PADS(som_rev_detect);
|
|
||||||
|
|
||||||
- if (val1 == 0)
|
|
||||||
+ val1 = gpio_get_value(IMX_GPIO_NR(6, 0));
|
|
||||||
+ val2 = gpio_get_value(IMX_GPIO_NR(6, 4));
|
|
||||||
+
|
|
||||||
+ if (val1 == 1 && val2 == 0)
|
|
||||||
return true;
|
|
||||||
- else
|
|
||||||
- return false;
|
|
||||||
+
|
|
||||||
+ return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
int checkboard(void)
|
|
||||||
{
|
|
||||||
- if (is_hummingboard2())
|
|
||||||
- puts("Board: MX6 Hummingboard2\n");
|
|
||||||
- else if (is_hummingboard())
|
|
||||||
- puts("Board: MX6 Hummingboard\n");
|
|
||||||
+ switch (board_type()) {
|
|
||||||
+ case CUBOXI:
|
|
||||||
+ puts("Board: MX6 Cubox-i");
|
|
||||||
+ break;
|
|
||||||
+ case HUMMINGBOARD:
|
|
||||||
+ puts("Board: MX6 HummingBoard");
|
|
||||||
+ break;
|
|
||||||
+ case HUMMINGBOARD2:
|
|
||||||
+ puts("Board: MX6 HummingBoard2");
|
|
||||||
+ break;
|
|
||||||
+ case UNKNOWN:
|
|
||||||
+ default:
|
|
||||||
+ puts("Board: Unknown\n");
|
|
||||||
+ goto out;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (is_rev_15_som())
|
|
||||||
+ puts(" (som rev 1.5)\n");
|
|
||||||
else
|
|
||||||
- puts("Board: MX6 Cubox-i\n");
|
|
||||||
+ puts("\n");
|
|
||||||
|
|
||||||
+out:
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int board_late_init(void)
|
|
||||||
{
|
|
||||||
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
|
||||||
- if (is_hummingboard2())
|
|
||||||
- env_set("board_name", "HUMMINGBOARD2");
|
|
||||||
- else if (is_hummingboard())
|
|
||||||
+ switch (board_type()) {
|
|
||||||
+ case CUBOXI:
|
|
||||||
+ env_set("board_name", "CUBOXI");
|
|
||||||
+ break;
|
|
||||||
+ case HUMMINGBOARD:
|
|
||||||
env_set("board_name", "HUMMINGBOARD");
|
|
||||||
- else
|
|
||||||
+ break;
|
|
||||||
+ case HUMMINGBOARD2:
|
|
||||||
+ env_set("board_name", "HUMMINGBOARD2");
|
|
||||||
+ break;
|
|
||||||
+ case UNKNOWN:
|
|
||||||
+ default:
|
|
||||||
env_set("board_name", "CUBOXI");
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (is_mx6dq())
|
|
||||||
env_set("board_rev", "MX6Q");
|
|
||||||
else
|
|
||||||
env_set("board_rev", "MX6DL");
|
|
||||||
+
|
|
||||||
+ if (is_rev_15_som())
|
|
||||||
+ env_set("som_rev", "V15");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
|
|
||||||
index 6e2137769822..803661cfa843 100644
|
|
||||||
--- a/include/configs/mx6cuboxi.h
|
|
||||||
+++ b/include/configs/mx6cuboxi.h
|
|
||||||
@@ -101,18 +101,18 @@
|
|
||||||
"fi; " \
|
|
||||||
"fi\0" \
|
|
||||||
"findfdt="\
|
|
||||||
- "if test $board_name = HUMMINGBOARD2 && test $board_rev = MX6Q ; then " \
|
|
||||||
- "setenv fdtfile imx6q-hummingboard2.dtb; fi; " \
|
|
||||||
- "if test $board_name = HUMMINGBOARD2 && test $board_rev = MX6DL ; then " \
|
|
||||||
- "setenv fdtfile imx6dl-hummingboard2.dtb; fi; " \
|
|
||||||
- "if test $board_name = HUMMINGBOARD && test $board_rev = MX6Q ; then " \
|
|
||||||
- "setenv fdtfile imx6q-hummingboard.dtb; fi; " \
|
|
||||||
- "if test $board_name = HUMMINGBOARD && test $board_rev = MX6DL ; then " \
|
|
||||||
- "setenv fdtfile imx6dl-hummingboard.dtb; fi; " \
|
|
||||||
- "if test $board_name = CUBOXI && test $board_rev = MX6Q ; then " \
|
|
||||||
- "setenv fdtfile imx6q-cubox-i.dtb; fi; " \
|
|
||||||
- "if test $board_name = CUBOXI && test $board_rev = MX6DL ; then " \
|
|
||||||
- "setenv fdtfile imx6dl-cubox-i.dtb; fi; " \
|
|
||||||
+ "if test $board_rev = MX6Q ; then " \
|
|
||||||
+ "setenv fdtprefix imx6q; fi; " \
|
|
||||||
+ "if test $board_rev = MX6DL ; then " \
|
|
||||||
+ "setenv fdtprefix imx6dl; fi; " \
|
|
||||||
+ "if test $som_rev = V15 ; then " \
|
|
||||||
+ "setenv fdtsuffix -som-v15; fi; " \
|
|
||||||
+ "if test $board_name = HUMMINGBOARD2 ; then " \
|
|
||||||
+ "setenv fdtfile ${fdtprefix}-hummingboard2${fdtsuffix}.dtb; fi; " \
|
|
||||||
+ "if test $board_name = HUMMINGBOARD ; then " \
|
|
||||||
+ "setenv fdtfile ${fdtprefix}-hummingboard${fdtsuffix}.dtb; fi; " \
|
|
||||||
+ "if test $board_name = CUBOXI ; then " \
|
|
||||||
+ "setenv fdtfile ${fdtprefix}-cubox-i${fdtsuffix}.dtb; fi; " \
|
|
||||||
"if test $fdtfile = undefined; then " \
|
|
||||||
"echo WARNING: Could not determine dtb to use; fi; \0" \
|
|
||||||
BOOTENV
|
|
||||||
|
|
||||||
From patchwork Thu Jun 7 13:17:37 2018
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
Subject: [U-Boot,2/2] mx6cuboxi: fix 4GB ddr memory detection
|
|
||||||
X-Patchwork-Submitter: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
X-Patchwork-Id: 926301
|
|
||||||
Message-Id: <b26ecc27cd034d1115670e877705b1652bea3277.1528377457.git.baruch@tkos.co.il>
|
|
||||||
To: Fabio Estevam <fabio.estevam@nxp.com>,
|
|
||||||
Stefano Babic <sbabic@denx.de>
|
|
||||||
Cc: u-boot@lists.denx.de, Baruch Siach <baruch@tkos.co.il>,
|
|
||||||
Rabeeh Khoury <rabeeh@solid-run.com>
|
|
||||||
Date: Thu, 7 Jun 2018 16:17:37 +0300
|
|
||||||
From: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
|
||||||
|
|
||||||
From: Jon Nettleton <jon@solid-run.com>
|
|
||||||
|
|
||||||
The soms with 4GB ddr have a rowaddr of 16 not 15, this allows
|
|
||||||
the detection mechanism to properly identify them as 4GB.
|
|
||||||
However these soms can be populated with whatever amount of
|
|
||||||
memory the customer requests therefor we need a ram stride test.
|
|
||||||
We can not use the get_ram_size() function because not all 4GB's
|
|
||||||
of DDR is addressable on a 32-bit architecture. Therefore instead
|
|
||||||
we use a memory stride of 128MB's and look for the address that
|
|
||||||
the memory wraps. This function is used for all som types to
|
|
||||||
catch most memory configurations.
|
|
||||||
|
|
||||||
This is a revised version of Rabeeh Khoury's original code.
|
|
||||||
|
|
||||||
Signed-off-by: Jon Nettleton <jon@solid-run.com>
|
|
||||||
Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
|
|
||||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
|
|
||||||
---
|
|
||||||
board/solidrun/mx6cuboxi/mx6cuboxi.c | 46 ++++++++++++++++++++++++++--
|
|
||||||
1 file changed, 44 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
|
||||||
index 1567cf0c91af..38d89f0130bb 100644
|
|
||||||
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
|
||||||
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
|
||||||
@@ -64,9 +64,51 @@ enum board_type {
|
|
||||||
UNKNOWN = 0x03,
|
|
||||||
};
|
|
||||||
|
|
||||||
+#define MEM_STRIDE 0x4000000
|
|
||||||
+static u32 get_ram_size_stride_test(u32 *base, u32 maxsize)
|
|
||||||
+{
|
|
||||||
+ volatile u32 *addr;
|
|
||||||
+ u32 save[64];
|
|
||||||
+ u32 cnt;
|
|
||||||
+ u32 size;
|
|
||||||
+ int i = 0;
|
|
||||||
+
|
|
||||||
+ /* First save the data */
|
|
||||||
+ for (cnt = 0; cnt < maxsize; cnt += MEM_STRIDE) {
|
|
||||||
+ addr = (volatile u32 *)((u32)base + cnt); /* pointer arith! */
|
|
||||||
+ sync ();
|
|
||||||
+ save[i++] = *addr;
|
|
||||||
+ sync ();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* First write a signature */
|
|
||||||
+ * (volatile u32 *)base = 0x12345678;
|
|
||||||
+ for (size = MEM_STRIDE; size < maxsize; size += MEM_STRIDE) {
|
|
||||||
+ * (volatile u32 *)((u32)base + size) = size;
|
|
||||||
+ sync ();
|
|
||||||
+ if (* (volatile u32 *)((u32)base) == size) { /* We reached the overlapping address */
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Restore the data */
|
|
||||||
+ for (cnt = (maxsize - MEM_STRIDE); i > 0; cnt -= MEM_STRIDE) {
|
|
||||||
+ addr = (volatile u32 *)((u32)base + cnt); /* pointer arith! */
|
|
||||||
+ sync ();
|
|
||||||
+ *addr = save[i--];
|
|
||||||
+ sync ();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return (size);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
int dram_init(void)
|
|
||||||
{
|
|
||||||
- gd->ram_size = imx_ddr_size();
|
|
||||||
+ u32 max_size = imx_ddr_size();
|
|
||||||
+
|
|
||||||
+ gd->ram_size = get_ram_size_stride_test((u32 *) CONFIG_SYS_SDRAM_BASE,
|
|
||||||
+ (u32)max_size);
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -626,7 +668,7 @@ static struct mx6_ddr3_cfg mem_ddr_4g = {
|
|
||||||
.density = 4,
|
|
||||||
.width = 16,
|
|
||||||
.banks = 8,
|
|
||||||
- .rowaddr = 15,
|
|
||||||
+ .rowaddr = 16,
|
|
||||||
.coladdr = 10,
|
|
||||||
.pagesz = 2,
|
|
||||||
.trcd = 1375,
|
|
||||||
@ -24,7 +24,6 @@ Patch4: usb_kbd-with-DM-enabled.patch
|
|||||||
|
|
||||||
# Board fixes and enablement
|
# Board fixes and enablement
|
||||||
Patch11: sunxi-Fix-MMC-driver-crashes.patch
|
Patch11: sunxi-Fix-MMC-driver-crashes.patch
|
||||||
Patch12: mx6cuboxi-consolidate-board-detection-and-add-som-revision-checking.patch
|
|
||||||
Patch13: dragonboard-fixes.patch
|
Patch13: dragonboard-fixes.patch
|
||||||
Patch14: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch
|
Patch14: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch
|
||||||
Patch15: rockchip-make_fit_atf-use-elf-entry-point.patch
|
Patch15: rockchip-make_fit_atf-use-elf-entry-point.patch
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user