[U-Boot] [PATCH v8 7/7] arm: socfpga: Add FPGA driver support for Arria 10
From: Tien Fong Chee
Add FPGA driver support for Arria 10.
Signed-off-by: Tien Fong Chee
---
arch/arm/mach-socfpga/include/mach/fpga_manager.h | 2 +
.../include/mach/fpga_manager_arria10.h| 100 +
configs/socfpga_arria10_defconfig | 2 +
drivers/fpga/Makefile | 1 +
drivers/fpga/socfpga_arria10.c | 479 +
include/configs/socfpga_common.h | 3 +-
6 files changed, 585 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
create mode 100644 drivers/fpga/socfpga_arria10.c
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
index b046c2c..a21c716 100644
--- a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
@@ -12,6 +12,8 @@
#if defined(CONFIG_TARGET_SOCFPGA_GEN5)
#include
+#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
+#include
#endif
/* FPGA CD Ratio Value */
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
new file mode 100644
index 000..9cbf696
--- /dev/null
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2017 Intel Corporation
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:GPL-2.0
+ */
+
+#ifndef _FPGA_MANAGER_ARRIA10_H_
+#define _FPGA_MANAGER_ARRIA10_H_
+
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_CRC_ERROR_SET_MSK BIT(0)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE_SET_MSK BIT(1)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_USERMODE_SET_MSK BIT(2)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_INITDONE_OE_SET_MSKBIT(3)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_NSTATUS_PIN_SET_MSKBIT(4)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_NSTATUS_OE_SET_MSK BIT(5)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_CONDONE_PIN_SET_MSKBIT(6)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_CONDONE_OE_SET_MSK BIT(7)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_CVP_CONF_DONE_SET_MSK BIT(8)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_PR_READY_SET_MSK BIT(9)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_PR_DONE_SET_MSKBIT(10)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_PR_ERROR_SET_MSK BIT(11)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_NCONFIG_PIN_SET_MSKBIT(12)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_NCEO_OE_SET_MSKBIT(13)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL0_SET_MSK BIT(16)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL1_SET_MSK BIT(17)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL2_SET_MSK BIT(18)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL_SET_MSD (\
+ ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL0_SET_MSK |\
+ ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL1_SET_MSK |\
+ ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL2_SET_MSK)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_IMGCFG_FIFOEMPTY_SET_MSK BIT(24)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_IMGCFG_FIFOFULL_SET_MSKBIT(25)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_JTAGM_SET_MSK BIT(28)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_EMR_SET_MSKBIT(29)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL0_LSB 16
+
+#define ALT_FPGAMGR_IMGCFG_CTL_00_S2F_NENABLE_NCONFIG_SET_MSK BIT(0)
+#define ALT_FPGAMGR_IMGCFG_CTL_00_S2F_NENABLE_NSTATUS_SET_MSK BIT(1)
+#define ALT_FPGAMGR_IMGCFG_CTL_00_S2F_NENABLE_CONDONE_SET_MSK BIT(2)
+#define ALT_FPGAMGR_IMGCFG_CTL_00_S2F_NCONFIG_SET_MSK BIT(8)
+#define ALT_FPGAMGR_IMGCFG_CTL_00_S2F_NSTATUS_OE_SET_MSK BIT(16)
+#define ALT_FPGAMGR_IMGCFG_CTL_00_S2F_CONDONE_OE_SET_MSK BIT(24)
+
+#define ALT_FPGAMGR_IMGCFG_CTL_01_S2F_NENABLE_CONFIG_SET_MSK BIT(0)
+#define ALT_FPGAMGR_IMGCFG_CTL_01_S2F_PR_REQUEST_SET_MSK BIT(16)
+#define ALT_FPGAMGR_IMGCFG_CTL_01_S2F_NCE_SET_MSK BIT(24)
+
+#define ALT_FPGAMGR_IMGCFG_CTL_02_EN_CFG_CTRL_SET_MSK BIT(0)
+#define ALT_FPGAMGR_IMGCFG_CTL_02_EN_CFG_DATA_SET_MSK BIT(8)
+#define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_SET_MSK 0x0003
+#define ALT_FPGAMGR_IMGCFG_CTL_02_CFGWIDTH_SET_MSK BIT(24)
+#define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_LSB 16
+
+#ifndef __ASSEMBLY__
+
+struct socfpga_fpga_manager {
+ u32 _pad_0x0_0x7[2];
+ u32 dclkcnt;
+ u32 dclkstat;
+ u32 gpo;
+ u32 gpi;
+ u32 misci;
+ u32 _pad_0x1c_0x2f[5];
+ u32 emr_data0;
+ u32 emr_data1;
+ u32 emr_data2;
+ u32 emr_data3;
+ u32 emr_data4;
+ u32 emr_data5;
+ u32 emr_valid;
+ u32 emr_en;
+ u32 jtag_config;
+ u32 jtag_status;
+ u32 jtag_kick;
+ u32 _pad_0x5c_0x5f;
+ u32 jtag_data_w;
+ u32 jtag_data_r;
+ u32 _pad_0x68_0x6f[2];
+ u32 imgcfg_ctrl_00;
+
[U-Boot] [PATCH v8 6/7] arm: socfpga: Move FPGA manager driver to FPGA driver
From: Tien Fong Chee
Move FPGA manager driver which is Gen5 specific code from arch/arm/
into FPGA driver at driver/fpga/. No functional change.
Signed-off-by: Tien Fong Chee
---
arch/arm/mach-socfpga/Makefile | 1 -
arch/arm/mach-socfpga/fpga_manager.c | 78
drivers/fpga/socfpga_gen5.c | 54 +
3 files changed, 54 insertions(+), 79 deletions(-)
delete mode 100644 arch/arm/mach-socfpga/fpga_manager.c
diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile
index 286bfef..824cd8e 100644
--- a/arch/arm/mach-socfpga/Makefile
+++ b/arch/arm/mach-socfpga/Makefile
@@ -20,7 +20,6 @@ obj-y += reset_manager_gen5.o
obj-y += scan_manager.o
obj-y += system_manager_gen5.o
obj-y += wrap_pll_config.o
-obj-y += fpga_manager.o
endif
ifdef CONFIG_TARGET_SOCFPGA_ARRIA10
diff --git a/arch/arm/mach-socfpga/fpga_manager.c
b/arch/arm/mach-socfpga/fpga_manager.c
deleted file mode 100644
index f909573..000
--- a/arch/arm/mach-socfpga/fpga_manager.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2012 Altera Corporation
- * All rights reserved.
- *
- * This file contains only support functions used also by the SoCFPGA
- * platform code, the real meat is located in drivers/fpga/socfpga.c .
- *
- * SPDX-License-Identifier:BSD-3-Clause
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* Timeout count */
-#define FPGA_TIMEOUT_CNT 0x100
-
-static struct socfpga_fpga_manager *fpgamgr_regs =
- (struct socfpga_fpga_manager *)SOCFPGA_FPGAMGRREGS_ADDRESS;
-
-/* Check whether FPGA Init_Done signal is high */
-static int is_fpgamgr_initdone_high(void)
-{
- unsigned long val;
-
- val = readl(&fpgamgr_regs->gpio_ext_porta);
- return val & FPGAMGRREGS_MON_GPIO_EXT_PORTA_ID_MASK;
-}
-
-/* Get the FPGA mode */
-int fpgamgr_get_mode(void)
-{
- unsigned long val;
-
- val = readl(&fpgamgr_regs->stat);
- return val & FPGAMGRREGS_STAT_MODE_MASK;
-}
-
-/* Check whether FPGA is ready to be accessed */
-int fpgamgr_test_fpga_ready(void)
-{
- /* Check for init done signal */
- if (!is_fpgamgr_initdone_high())
- return 0;
-
- /* Check again to avoid false glitches */
- if (!is_fpgamgr_initdone_high())
- return 0;
-
- if (fpgamgr_get_mode() != FPGAMGRREGS_MODE_USERMODE)
- return 0;
-
- return 1;
-}
-
-/* Poll until FPGA is ready to be accessed or timeout occurred */
-int fpgamgr_poll_fpga_ready(void)
-{
- unsigned long i;
-
- /* If FPGA is blank, wait till WD invoke warm reset */
- for (i = 0; i < FPGA_TIMEOUT_CNT; i++) {
- /* check for init done signal */
- if (!is_fpgamgr_initdone_high())
- continue;
- /* check again to avoid false glitches */
- if (!is_fpgamgr_initdone_high())
- continue;
- return 1;
- }
-
- return 0;
-}
diff --git a/drivers/fpga/socfpga_gen5.c b/drivers/fpga/socfpga_gen5.c
index 3dfb030..d8f222a 100644
--- a/drivers/fpga/socfpga_gen5.c
+++ b/drivers/fpga/socfpga_gen5.c
@@ -21,6 +21,60 @@ static struct socfpga_fpga_manager *fpgamgr_regs =
static struct socfpga_system_manager *sysmgr_regs =
(struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS;
+/* Check whether FPGA Init_Done signal is high */
+static int is_fpgamgr_initdone_high(void)
+{
+ unsigned long val;
+
+ val = readl(&fpgamgr_regs->gpio_ext_porta);
+ return val & FPGAMGRREGS_MON_GPIO_EXT_PORTA_ID_MASK;
+}
+
+/* Get the FPGA mode */
+int fpgamgr_get_mode(void)
+{
+ unsigned long val;
+
+ val = readl(&fpgamgr_regs->stat);
+ return val & FPGAMGRREGS_STAT_MODE_MASK;
+}
+
+/* Check whether FPGA is ready to be accessed */
+int fpgamgr_test_fpga_ready(void)
+{
+ /* Check for init done signal */
+ if (!is_fpgamgr_initdone_high())
+ return 0;
+
+ /* Check again to avoid false glitches */
+ if (!is_fpgamgr_initdone_high())
+ return 0;
+
+ if (fpgamgr_get_mode() != FPGAMGRREGS_MODE_USERMODE)
+ return 0;
+
+ return 1;
+}
+
+/* Poll until FPGA is ready to be accessed or timeout occurred */
+int fpgamgr_poll_fpga_ready(void)
+{
+ unsigned long i;
+
+ /* If FPGA is blank, wait till WD invoke warm reset */
+ for (i = 0; i < FPGA_TIMEOUT_CNT; i++) {
+ /* check for init done signal */
+ if (!is_fpgamgr_initdone_high())
+ continue;
+ /* check again to avoid false glitches */
+ if (!is_fpgamgr_initdone_high())
+ continue;
+ return 1;
+ }
+
+ return 0;
+}
+
/* Set CD ratio */
static void fpgamgr_set_cd_ratio(unsigned long ratio)
{
--
2.2.0
___
[U-Boot] [PATCH v8 4/7] arm: socfpga: Enable FPGA driver on SPL
From: Tien Fong Chee This patch is for enabling FPGA driver support on SPL Signed-off-by: Tien Fong Chee --- configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_de10_nano_defconfig| 1 + configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + 11 files changed, 11 insertions(+) diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 6f2a06f..4b1e252 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_FPGA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 1047657..fe7ac08 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_FPGA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index 72a9e5d..d86a9d6 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_FPGA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_de10_nano_defconfig b/configs/socfpga_de10_nano_defconfig index 67864cf..ac8ca70 100644 --- a/configs/socfpga_de10_nano_defconfig +++ b/configs/socfpga_de10_nano_defconfig @@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_FPGA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index 35c4484..cc0a35d 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_FPGA_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index ae688f8..ccfed7a 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_FPGA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index c5e3b7b..9bcb47d 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_FPGA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 3ff7bb7..ef54e1f 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_FPGA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index fb9c13f..78daf26 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_FPGA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index d90d6a1..4a12379 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_FPGA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index c3fbe40..3fc37dc 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y C
[U-Boot] [PATCH v8 3/7] arm: socfpga: Convert all Intel related FPGA configuration to Kconfig
From: Tien Fong Chee This converts the following to Kconfig: CONFIG_FPGA CONFIG_FPGA_ALTERA CONFIG_FPGA_SOCFPGA Signed-off-by: Tien Fong Chee --- configs/astro_mcf5373l_defconfig | 1 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_de10_nano_defconfig| 1 + configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + configs/theadorable_debug_defconfig| 1 + configs/theadorable_defconfig | 1 + drivers/fpga/Kconfig | 8 include/configs/astro_mcf5373l.h | 2 -- include/configs/socfpga_common.h | 3 --- include/configs/theadorable.h | 2 -- 18 files changed, 22 insertions(+), 7 deletions(-) diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index d5e8430..80fb1fa 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -10,4 +10,5 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y +CONFIG_FPGA_ALTERA=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index a565384..6f2a06f 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y +CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 06fc82c..1047657 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y +CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index 0697e2e..72a9e5d 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -39,6 +39,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y +CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y diff --git a/configs/socfpga_de10_nano_defconfig b/configs/socfpga_de10_nano_defconfig index cd64fb9..67864cf 100644 --- a/configs/socfpga_de10_nano_defconfig +++ b/configs/socfpga_de10_nano_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y +CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index bba90be..35c4484 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_DM=y +CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index 058791e..ae688f8 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index 627b90f..c5e3b7b 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y +CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index bf5d63d..3ff7bb7 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y +CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 5915faf..fb9c13f 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_UBI=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y +CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 4468d3b..d90d6a1 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_FS_GENERIC=y CO
[U-Boot] [PATCH v8 5/7] drivers: Enable FPGA driver build on SPL
From: Tien Fong Chee Enable FPGA driver build for SPL because FPGA driver is needed for SPL to configure and getting DDR up before loading U-boot into DDR and booting from there. FPGA driver build on SPL must be enabled 1st before applying next patch to avoid build failed, because fpga_manager which would be moved to drivers/fpga by next patch are required in SPL. Signed-off-by: Tien Fong Chee --- drivers/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/Makefile b/drivers/Makefile index 64c39d3..4478212 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -48,6 +48,7 @@ obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/ obj-$(CONFIG_SPL_SATA_SUPPORT) += block/ obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += block/ obj-$(CONFIG_SPL_MMC_SUPPORT) += block/ +obj-$(CONFIG_SPL_FPGA_SUPPORT) += fpga/ endif ifdef CONFIG_TPL_BUILD -- 2.2.0 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v8 1/7] arm: socfpga: Remove unused passing parameter of socfpga_bridges_reset
From: Tien Fong Chee
Remove parameter from socfpga_bridges_reset(), and keeping this function
for single purpose which is just triggering reset on bridges.
socfpga_reset_deassert_bridges_handoff() can be called for releasing reset
on any bridges based on the bridge setting defined in fdt.
Signed-off-by: Tien Fong Chee
---
arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h | 2 +-
arch/arm/mach-socfpga/reset_manager_arria10.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h
b/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h
index 7922db8..b6d7f4f 100644
--- a/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h
+++ b/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h
@@ -17,7 +17,7 @@ int socfpga_reset_deassert_bridges_handoff(void);
void socfpga_reset_assert_fpga_connected_peripherals(void);
void socfpga_reset_deassert_osc1wd0(void);
void socfpga_reset_uart(int assert);
-int socfpga_bridges_reset(int enable);
+int socfpga_bridges_reset(void);
struct socfpga_reset_manager {
u32 stat;
diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c
b/arch/arm/mach-socfpga/reset_manager_arria10.c
index d8c858c..66f1ec2 100644
--- a/arch/arm/mach-socfpga/reset_manager_arria10.c
+++ b/arch/arm/mach-socfpga/reset_manager_arria10.c
@@ -318,13 +318,13 @@ void socfpga_per_reset_all(void)
}
#if defined(CONFIG_SOCFPGA_VIRTUAL_TARGET)
-int socfpga_bridges_reset(int enable)
+int socfpga_bridges_reset(void)
{
/* For SoCFPGA-VT, this is NOP. */
return 0;
}
#else
-int socfpga_bridges_reset(int enable)
+int socfpga_bridges_reset(void)
{
int ret;
--
2.2.0
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v8 2/7] arm: socfpga: Restructure FPGA driver in the preparation to support A10
From: Tien Fong Chee
Move FPGA driver which is Gen5 specific code into Gen5 driver file
and keeping common FPGA driver intact. All the changes are still keeping
in driver/fpga/ and no functional change. Subsequent patch would move
FPGA manager driver from arch/arm into driver/fpga/.
Signed-off-by: Tien Fong Chee
---
arch/arm/mach-socfpga/Makefile | 2 +-
arch/arm/mach-socfpga/include/mach/fpga_manager.h | 68 +-
.../mach/{fpga_manager.h => fpga_manager_gen5.h} | 69 +++---
drivers/fpga/Makefile | 1 +
drivers/fpga/socfpga.c | 241 +
drivers/fpga/{socfpga.c => socfpga_gen5.c} | 54 +
6 files changed, 49 insertions(+), 386 deletions(-)
copy arch/arm/mach-socfpga/include/mach/{fpga_manager.h =>
fpga_manager_gen5.h} (57%)
copy drivers/fpga/{socfpga.c => socfpga_gen5.c} (83%)
diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile
index 41b779c..286bfef 100644
--- a/arch/arm/mach-socfpga/Makefile
+++ b/arch/arm/mach-socfpga/Makefile
@@ -9,7 +9,6 @@
obj-y += board.o
obj-y += clock_manager.o
-obj-y += fpga_manager.o
obj-y += misc.o
obj-y += reset_manager.o
obj-y += timer.o
@@ -21,6 +20,7 @@ obj-y += reset_manager_gen5.o
obj-y += scan_manager.o
obj-y += system_manager_gen5.o
obj-y += wrap_pll_config.o
+obj-y += fpga_manager.o
endif
ifdef CONFIG_TARGET_SOCFPGA_ARRIA10
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
index a077e22..b046c2c 100644
--- a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Altera Corporation
+ * Copyright (C) 2012-2017 Altera Corporation
* All rights reserved.
*
* SPDX-License-Identifier:BSD-3-Clause
@@ -10,58 +10,9 @@
#include
-struct socfpga_fpga_manager {
- /* FPGA Manager Module */
- u32 stat; /* 0x00 */
- u32 ctrl;
- u32 dclkcnt;
- u32 dclkstat;
- u32 gpo;/* 0x10 */
- u32 gpi;
- u32 misci; /* 0x18 */
- u32 _pad_0x1c_0x82c[517];
-
- /* Configuration Monitor (MON) Registers */
- u32 gpio_inten; /* 0x830 */
- u32 gpio_intmask;
- u32 gpio_inttype_level;
- u32 gpio_int_polarity;
- u32 gpio_intstatus; /* 0x840 */
- u32 gpio_raw_intstatus;
- u32 _pad_0x848;
- u32 gpio_porta_eoi;
- u32 gpio_ext_porta; /* 0x850 */
- u32 _pad_0x854_0x85c[3];
- u32 gpio_1s_sync; /* 0x860 */
- u32 _pad_0x864_0x868[2];
- u32 gpio_ver_id_code;
- u32 gpio_config_reg2; /* 0x870 */
- u32 gpio_config_reg1;
-};
-
-#define FPGAMGRREGS_STAT_MODE_MASK 0x7
-#define FPGAMGRREGS_STAT_MSEL_MASK 0xf8
-#define FPGAMGRREGS_STAT_MSEL_LSB 3
-
-#define FPGAMGRREGS_CTRL_CFGWDTH_MASK 0x200
-#define FPGAMGRREGS_CTRL_AXICFGEN_MASK 0x100
-#define FPGAMGRREGS_CTRL_NCONFIGPULL_MASK 0x4
-#define FPGAMGRREGS_CTRL_NCE_MASK 0x2
-#define FPGAMGRREGS_CTRL_EN_MASK 0x1
-#define FPGAMGRREGS_CTRL_CDRATIO_LSB 6
-
-#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_CRC_MASK0x8
-#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_ID_MASK 0x4
-#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_CD_MASK 0x2
-#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_NS_MASK 0x1
-
-/* FPGA Mode */
-#define FPGAMGRREGS_MODE_FPGAOFF 0x0
-#define FPGAMGRREGS_MODE_RESETPHASE0x1
-#define FPGAMGRREGS_MODE_CFGPHASE 0x2
-#define FPGAMGRREGS_MODE_INITPHASE 0x3
-#define FPGAMGRREGS_MODE_USERMODE 0x4
-#define FPGAMGRREGS_MODE_UNKNOWN 0x5
+#if defined(CONFIG_TARGET_SOCFPGA_GEN5)
+#include
+#endif
/* FPGA CD Ratio Value */
#define CDRATIO_x1 0x0
@@ -69,9 +20,14 @@ struct socfpga_fpga_manager {
#define CDRATIO_x4 0x2
#define CDRATIO_x8 0x3
-/* SoCFPGA support functions */
-int fpgamgr_test_fpga_ready(void);
-int fpgamgr_poll_fpga_ready(void);
+#ifndef __ASSEMBLY__
+
+/* Common prototypes */
int fpgamgr_get_mode(void);
+int fpgamgr_poll_fpga_ready(void);
+void fpgamgr_program_write(const void *rbf_data, size_t rbf_size);
+int fpgamgr_test_fpga_ready(void);
+int fpgamgr_dclkcnt_set(unsigned long cnt);
+#endif /* __ASSEMBLY__ */
#endif /* _FPGA_MANAGER_H_ */
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
b/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
similarity index 57%
copy from arch/arm/mach-socfpga/include/mach/fpga_manager.h
copy to arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
index a077e22..2de7a11 100644
--- a/arch/arm/ma
[U-Boot] [PATCH v8 0/7] Add Intel Arria 10 SoC FPGA driver
From: Tien Fong Chee
This is the 8th version of patchset to adds support for Intel Arria 10 SoC FPGA
driver. This version mainly resolved comments from Marek in [v7] and pulling in
the Intel related FPGA Kconfig conversion patch into this patchset.
This series is working on top of u-boot-socfpga.git -
http://git.denx.de/u-boot-socfpga.git
[v7]: https://www.mail-archive.com/u-boot@lists.denx.de/msg251213.html
v7 -> v8 changes:
-
- Pull in the Intel related FPGA Kconfig convertion patch into this patchset
- Changed SPL_FPGA_SUPPORT Macro config header into Kconfig
- Improved the git commit message on patch 5, which has explanation why FPGA
build
must be enabled in SPL before applying patch 6 to avoid build failed when the
expected
functions in driver/fpga/ is not availabled in SPL.
Patchset history
[v1]: https://www.mail-archive.com/u-boot@lists.denx.de/msg247788.html
[v2]: https://www.mail-archive.com/u-boot@lists.denx.de/msg248541.html
[v3]: https://www.mail-archive.com/u-boot@lists.denx.de/msg249160.html
[v4]: https://www.mail-archive.com/u-boot@lists.denx.de/msg250149.html
[v5]: https://www.mail-archive.com/u-boot@lists.denx.de/msg250517.html
[v6]: https://www.mail-archive.com/u-boot@lists.denx.de/msg250687.html
Tien Fong Chee (7):
arm: socfpga: Remove unused passing parameter of socfpga_bridges_reset
arm: socfpga: Restructure FPGA driver in the preparation to support
A10
arm: socfpga: Convert all Intel related FPGA configuration to Kconfig
arm: socfpga: Enable FPGA driver on SPL
drivers: Enable FPGA driver build on SPL
arm: socfpga: Move FPGA manager driver to FPGA driver
arm: socfpga: Add FPGA driver support for Arria 10
arch/arm/mach-socfpga/Makefile | 1 -
arch/arm/mach-socfpga/fpga_manager.c | 78
arch/arm/mach-socfpga/include/mach/fpga_manager.h | 70 +--
.../include/mach/fpga_manager_arria10.h| 100 +
.../mach/{fpga_manager.h => fpga_manager_gen5.h} | 69 ++-
.../include/mach/reset_manager_arria10.h | 2 +-
arch/arm/mach-socfpga/reset_manager_arria10.c | 4 +-
configs/astro_mcf5373l_defconfig | 1 +
configs/socfpga_arria10_defconfig | 2 +
configs/socfpga_arria5_defconfig | 2 +
configs/socfpga_cyclone5_defconfig | 2 +
configs/socfpga_de0_nano_soc_defconfig | 2 +
configs/socfpga_de10_nano_defconfig| 2 +
configs/socfpga_de1_soc_defconfig | 2 +
configs/socfpga_is1_defconfig | 2 +
configs/socfpga_mcvevk_defconfig | 2 +
configs/socfpga_sockit_defconfig | 2 +
configs/socfpga_socrates_defconfig | 2 +
configs/socfpga_sr1500_defconfig | 2 +
configs/socfpga_vining_fpga_defconfig | 2 +
configs/theadorable_debug_defconfig| 1 +
configs/theadorable_defconfig | 1 +
drivers/Makefile | 1 +
drivers/fpga/Kconfig | 8 +
drivers/fpga/Makefile | 2 +
drivers/fpga/socfpga.c | 241 +--
drivers/fpga/socfpga_arria10.c | 479 +
drivers/fpga/{socfpga.c => socfpga_gen5.c} | 98 ++---
include/configs/astro_mcf5373l.h | 2 -
include/configs/socfpga_common.h | 6 +-
include/configs/theadorable.h | 2 -
31 files changed, 719 insertions(+), 471 deletions(-)
delete mode 100644 arch/arm/mach-socfpga/fpga_manager.c
create mode 100644 arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
copy arch/arm/mach-socfpga/include/mach/{fpga_manager.h =>
fpga_manager_gen5.h} (57%)
create mode 100644 drivers/fpga/socfpga_arria10.c
copy drivers/fpga/{socfpga.c => socfpga_gen5.c} (85%)
--
2.2.0
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] power: pmic: tps65218: Add DCDC3 configuration
On Friday 02 June 2017 03:00 PM, Keerthy wrote: > Some boards like am437x-gp-evm require dcdc3 also to be configured > as it feeds on to ddr. Hence add the capability as well. > > Signed-off-by: Keerthy Reviewed-by: Lokesh Vutla Thanks and regards, Lokesh ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] board: ti: AM43XX: Add ddr voltage rail configuration
On Friday 02 June 2017 03:00 PM, Keerthy wrote: > Add ddr voltage rail (dcdc3) configuration. Set the dcdc3 > DDR supply to 1.35V. > > Signed-off-by: Keerthy Reviewed-by: Lokesh Vutla Thanks and regards, Lokesh ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 5/7] serial: mxc: Move common baud gen into _mxc_serial_setbrg
From: Jagan Teki
Move the common baud generation code into _mxc_serial_setbrg
so-that dm and non-dm can call this func.
Signed-off-by: Jagan Teki
---
drivers/serial/serial_mxc.c | 50 ++---
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 4b19052..0fd3aaa 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -108,6 +108,8 @@
#define UTS_TXFULL (1<<4) /* TxFIFO full */
#define UTS_RXFULL (1<<3) /* RxFIFO full */
#define UTS_SOFTRS(1<<0) /* Software reset */
+#define TXTL 2 /* reset default */
+#define RXTL 1 /* reset default */
DECLARE_GLOBAL_DATA_PTR;
@@ -152,6 +154,26 @@ static void _mxc_serial_init(struct mxc_uart *base)
writel(0, &base->ts);
}
+static void _mxc_serial_setbrg(struct mxc_uart *base, unsigned long clk,
+ unsigned long baudrate, bool use_dte)
+{
+ u32 tmp;
+
+ tmp = RFDIV << UFCR_RFDIV_SHF;
+ if (use_dte)
+ tmp |= UFCR_DCEDTE;
+ else
+ tmp |= (TXTL << UFCR_TXTL_SHF) | (RXTL << UFCR_RXTL_SHF);
+ writel(tmp, &base->fcr);
+
+ writel(0xf, &base->bir);
+ writel(clk / (2 * baudrate), &base->bmr);
+
+ writel(UCR2_WS | UCR2_IRTS | UCR2_RXEN | UCR2_TXEN | UCR2_SRST,
+ &base->cr2);
+ writel(UCR1_UARTEN, &base->cr1);
+}
+
#ifndef CONFIG_DM_SERIAL
#ifndef CONFIG_MXC_UART_BASE
@@ -160,9 +182,6 @@ static void _mxc_serial_init(struct mxc_uart *base)
#define mxc_base ((struct mxc_uart *)CONFIG_MXC_UART_BASE)
-#define TXTL 2 /* reset default */
-#define RXTL 1 /* reset default */
-
static void mxc_serial_setbrg(void)
{
u32 clk = imx_get_uartclk();
@@ -170,16 +189,7 @@ static void mxc_serial_setbrg(void)
if (!gd->baudrate)
gd->baudrate = CONFIG_BAUDRATE;
- writel(((RFDIV << UFCR_RFDIV_SHF) |
- (TXTL << UFCR_TXTL_SHF) |
- (RXTL << UFCR_RXTL_SHF)),
- &mxc_base->fcr);
- writel(0xf, &mxc_base->bir);
- writel(clk / (2 * gd->baudrate), &mxc_base->bmr);
-
- writel(UCR2_WS | UCR2_IRTS | UCR2_RXEN | UCR2_TXEN | UCR2_SRST,
- &mxc_base->cr2);
- writel(UCR1_UARTEN, &mxc_base->cr1);
+ _mxc_serial_setbrg(mxc_base, clk, gd->baudrate, false);
}
static int mxc_serial_getc(void)
@@ -254,21 +264,9 @@ __weak struct serial_device *default_serial_console(void)
int mxc_serial_setbrg(struct udevice *dev, int baudrate)
{
struct mxc_serial_platdata *plat = dev->platdata;
- struct mxc_uart *const uart = plat->reg;
u32 clk = imx_get_uartclk();
- u32 tmp;
- tmp = RFDIV << UFCR_RFDIV_SHF;
- if (plat->use_dte)
- tmp |= UFCR_DCEDTE;
- writel(tmp, &uart->fcr);
-
- writel(0xf, &uart->bir);
- writel(clk / (2 * baudrate), &uart->bmr);
-
- writel(UCR2_WS | UCR2_IRTS | UCR2_RXEN | UCR2_TXEN | UCR2_SRST,
- &uart->cr2);
- writel(UCR1_UARTEN, &uart->cr1);
+ _mxc_serial_setbrg(plat->reg, clk, baudrate, plat->use_dte);
return 0;
}
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 2/7] serial: mxc: Use RFDIV in dm-code
From: Jagan Teki
Use RFDIV in dm-code instead of numeric value, so-that
it can be common for dm and non-dm.
Signed-off-by: Jagan Teki
---
drivers/serial/serial_mxc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 6d1d447..65c301d 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -76,6 +76,7 @@
#define UFCR_RXTL_SHF 0 /* Receiver trigger level shift */
#define UFCR_RFDIV (7<<7) /* Reference freq divider mask */
#define UFCR_RFDIV_SHF 7 /* Reference freq divider shift */
+#define RFDIV 4 /* divide input clock by 2 */
#define UFCR_DCEDTE(1<<6) /* DTE mode select */
#define UFCR_TXTL_SHF 10 /* Transmitter trigger level shift */
#define USR1_PARITYERR (1<<15) /* Parity error interrupt flag */
@@ -106,7 +107,7 @@
#define UTS_RXEMPTY(1<<5) /* RxFIFO empty */
#define UTS_TXFULL (1<<4) /* TxFIFO full */
#define UTS_RXFULL (1<<3) /* RxFIFO full */
-#define UTS_SOFTRST(1<<0) /* Software reset */
+#define UTS_SOFTRS(1<<0) /* Software reset */
DECLARE_GLOBAL_DATA_PTR;
@@ -146,7 +147,6 @@ struct mxc_uart {
#define TXTL 2 /* reset default */
#define RXTL 1 /* reset default */
-#define RFDIV 4 /* divide input clock by 2 */
static void mxc_serial_setbrg(void)
{
@@ -255,7 +255,7 @@ int mxc_serial_setbrg(struct udevice *dev, int baudrate)
u32 clk = imx_get_uartclk();
u32 tmp;
- tmp = 4 << UFCR_RFDIV_SHF;
+ tmp = RFDIV << UFCR_RFDIV_SHF;
if (plat->use_dte)
tmp |= UFCR_DCEDTE;
writel(tmp, &uart->fcr);
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 7/7] serial: mxc: Add debug uart support
From: Jagan Teki
Add support for the debug UART to assist with early debugging.
Enable it for i.CoreM6 as an example.
Signed-off-by: Jagan Teki
---
configs/imx6qdl_icore_mmc_defconfig | 4
drivers/serial/Kconfig | 8
drivers/serial/serial_mxc.c | 26 ++
3 files changed, 38 insertions(+)
diff --git a/configs/imx6qdl_icore_mmc_defconfig
b/configs/imx6qdl_icore_mmc_defconfig
index 4ab1fac..24010ec 100644
--- a/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@ -44,3 +44,7 @@ CONFIG_IMX_THERMAL=y
CONFIG_VIDEO_IPUV3=y
CONFIG_PHYLIB=y
CONFIG_PHY_SMSC=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_MXC=y
+CONFIG_DEBUG_UART_BASE=0x021f
+CONFIG_DEBUG_UART_CLOCK=2400
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 58fc7cd..32a3374 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -248,6 +248,14 @@ config DEBUG_UART_PIC32
will need to provide parameters to make this work. The driver will
be available until the real driver model serial is running.
+config DEBUG_UART_MXC
+ bool "IMX Serial port"
+ depends on MXC_UART
+ help
+ Select this to enable a debug UART using the serial_mxc driver. You
+ will need to provide parameters to make this work. The driver will
+ be available until the real driver model serial is running.
+
config DEBUG_UART_UNIPHIER
bool "UniPhier on-chip UART"
depends on ARCH_UNIPHIER
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 0bcd15c..18ff421 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -357,3 +357,29 @@ U_BOOT_DRIVER(serial_mxc) = {
.flags = DM_FLAG_PRE_RELOC,
};
#endif
+
+#ifdef CONFIG_DEBUG_UART_MXC
+#include
+
+static inline void _debug_uart_init(void)
+{
+ struct mxc_uart *base = (struct mxc_uart *)CONFIG_DEBUG_UART_BASE;
+
+ _mxc_serial_init(base);
+ _mxc_serial_setbrg(base, CONFIG_DEBUG_UART_CLOCK,
+ CONFIG_BAUDRATE, false);
+}
+
+static inline void _debug_uart_putc(int ch)
+{
+ struct mxc_uart *base = (struct mxc_uart *)CONFIG_DEBUG_UART_BASE;
+
+ while (!(readl(&base->ts) & UTS_TXEMPTY))
+ WATCHDOG_RESET();
+
+ writel(ch, &base->txd);
+}
+
+DEBUG_UART_FUNCS
+
+#endif
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 4/7] serial: mxc: Move common init into _mxc_serial_init
From: Jagan Teki
Move the common initialization code into _mxc_serial_init
so-that dm and non-dm can call this func.
Signed-off-by: Jagan Teki
---
drivers/serial/serial_mxc.c | 37 +
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 288b610..4b19052 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -137,6 +137,21 @@ struct mxc_uart {
u32 ts;
};
+static void _mxc_serial_init(struct mxc_uart *base)
+{
+ writel(0, &base->cr1);
+ writel(0, &base->cr2);
+
+ while (!(readl(&base->cr2) & UCR2_SRST));
+
+ writel(0x704 | UCR3_ADNIMP, &base->cr3);
+ writel(0x8000, &base->cr4);
+ writel(0x2b, &base->esc);
+ writel(0, &base->tim);
+
+ writel(0, &base->ts);
+}
+
#ifndef CONFIG_DM_SERIAL
#ifndef CONFIG_MXC_UART_BASE
@@ -205,17 +220,7 @@ static int mxc_serial_tstc(void)
*/
static int mxc_serial_init(void)
{
- writel(0, &mxc_base->cr1);
- writel(0, &mxc_base->cr2);
-
- while (!(readl(&mxc_base->cr2) & UCR2_SRST));
-
- writel(0x704 | UCR3_ADNIMP, &mxc_base->cr3);
- writel(0x8000, &mxc_base->cr4);
- writel(0x2b, &mxc_base->esc);
- writel(0, &mxc_base->tim);
-
- writel(0, &mxc_base->ts);
+ _mxc_serial_init(mxc_base);
serial_setbrg();
@@ -271,16 +276,8 @@ int mxc_serial_setbrg(struct udevice *dev, int baudrate)
static int mxc_serial_probe(struct udevice *dev)
{
struct mxc_serial_platdata *plat = dev->platdata;
- struct mxc_uart *const uart = plat->reg;
- writel(0, &uart->cr1);
- writel(0, &uart->cr2);
- while (!(readl(&uart->cr2) & UCR2_SRST));
- writel(0x704 | UCR3_ADNIMP, &uart->cr3);
- writel(0x8000, &uart->cr4);
- writel(0x2b, &uart->esc);
- writel(0, &uart->tim);
- writel(0, &uart->ts);
+ _mxc_serial_init(plat->reg);
return 0;
}
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 6/7] serial: mxc: Code cleanup
From: Jagan Teki - Remove space between #define to macro - Add tab between macro and value Signed-off-by: Jagan Teki --- drivers/serial/serial_mxc.c | 191 ++-- 1 file changed, 94 insertions(+), 97 deletions(-) diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index 0fd3aaa..0bcd15c 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -15,99 +15,99 @@ #include /* UART Control Register Bit Fields.*/ -#define URXD_CHARRDY(1<<15) -#define URXD_ERR(1<<14) -#define URXD_OVRRUN (1<<13) -#define URXD_FRMERR (1<<12) -#define URXD_BRK(1<<11) -#define URXD_PRERR (1<<10) -#define URXD_RX_DATA(0xFF) -#define UCR1_ADEN (1<<15) /* Auto dectect interrupt */ -#define UCR1_ADBR (1<<14) /* Auto detect baud rate */ -#define UCR1_TRDYEN (1<<13) /* Transmitter ready interrupt enable */ -#define UCR1_IDEN (1<<12) /* Idle condition interrupt */ -#define UCR1_RRDYEN (1<<9) /* Recv ready interrupt enable */ -#define UCR1_RDMAEN (1<<8) /* Recv ready DMA enable */ -#define UCR1_IREN (1<<7) /* Infrared interface enable */ -#define UCR1_TXMPTYEN (1<<6) /* Transimitter empty interrupt enable */ -#define UCR1_RTSDEN (1<<5) /* RTS delta interrupt enable */ -#define UCR1_SNDBRK (1<<4) /* Send break */ -#define UCR1_TDMAEN (1<<3) /* Transmitter ready DMA enable */ -#define UCR1_UARTCLKEN (1<<2) /* UART clock enabled */ -#define UCR1_DOZE (1<<1) /* Doze */ -#define UCR1_UARTEN (1<<0) /* UART enabled */ -#define UCR2_ESCI (1<<15) /* Escape seq interrupt enable */ -#define UCR2_IRTS (1<<14) /* Ignore RTS pin */ -#define UCR2_CTSC (1<<13) /* CTS pin control */ -#define UCR2_CTS(1<<12) /* Clear to send */ -#define UCR2_ESCEN (1<<11) /* Escape enable */ -#define UCR2_PREN (1<<8) /* Parity enable */ -#define UCR2_PROE (1<<7) /* Parity odd/even */ -#define UCR2_STPB (1<<6) /* Stop */ -#define UCR2_WS (1<<5) /* Word size */ -#define UCR2_RTSEN (1<<4) /* Request to send interrupt enable */ -#define UCR2_TXEN (1<<2) /* Transmitter enabled */ -#define UCR2_RXEN (1<<1) /* Receiver enabled */ -#define UCR2_SRST (1<<0) /* SW reset */ -#define UCR3_DTREN (1<<13) /* DTR interrupt enable */ -#define UCR3_PARERREN (1<<12) /* Parity enable */ -#define UCR3_FRAERREN (1<<11) /* Frame error interrupt enable */ -#define UCR3_DSR(1<<10) /* Data set ready */ -#define UCR3_DCD(1<<9) /* Data carrier detect */ -#define UCR3_RI (1<<8) /* Ring indicator */ -#define UCR3_ADNIMP (1<<7) /* Autobaud Detection Not Improved */ -#define UCR3_RXDSEN(1<<6) /* Receive status interrupt enable */ -#define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ -#define UCR3_AWAKEN(1<<4) /* Async wake interrupt enable */ -#define UCR3_REF25 (1<<3) /* Ref freq 25 MHz */ -#define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz */ -#define UCR3_INVT (1<<1) /* Inverted Infrared transmission */ -#define UCR3_BPEN (1<<0) /* Preset registers enable */ -#define UCR4_CTSTL_32 (32<<10) /* CTS trigger level (32 chars) */ -#define UCR4_INVR (1<<9) /* Inverted infrared reception */ -#define UCR4_ENIRI (1<<8) /* Serial infrared interrupt enable */ -#define UCR4_WKEN (1<<7) /* Wake interrupt enable */ -#define UCR4_REF16 (1<<6) /* Ref freq 16 MHz */ -#define UCR4_IRSC (1<<5) /* IR special case */ -#define UCR4_TCEN (1<<3) /* Transmit complete interrupt enable */ -#define UCR4_BKEN (1<<2) /* Break condition interrupt enable */ -#define UCR4_OREN (1<<1) /* Receiver overrun interrupt enable */ -#define UCR4_DREN (1<<0) /* Recv data ready interrupt enable */ -#define UFCR_RXTL_SHF 0 /* Receiver trigger level shift */ -#define UFCR_RFDIV (7<<7) /* Reference freq divider mask */ -#define UFCR_RFDIV_SHF 7 /* Reference freq divider shift */ -#define RFDIV 4 /* divide input clock by 2 */ -#define UFCR_DCEDTE(1<<6) /* DTE mode select */ -#define UFCR_TXTL_SHF 10 /* Transmitter trigger level shift */ -#define USR1_PARITYERR (1<<15) /* Parity error interrupt flag */ -#define USR1_RTSS (1<<14) /* RTS pin status */ -#define USR1_TRDY (1<<13) /* Transmitter ready interrupt/dma flag */ -#define USR1_RTSD (1<<12) /* RTS delta */ -#define USR1_ESCF (1<<11) /* Escape seq interrupt flag */ -#define USR1_FRAMERR(1<<10) /* Frame error interrupt flag */ -#define USR1_RRDY (1<<9) /* Receiver ready interrupt/dma flag */ -#define USR1_TIMEOUT(1<<7) /* Receive timeout interrupt status */ -#define USR1_RXDS (1<<6) /* Receiver idle interrupt flag */ -#def
[U-Boot] [PATCH 1/7] serial: mxc: Add common mxc_uart reg space
From: Jagan Teki
This patch will add common reg space for non-dm and
dm code and non-dm reg space can be accessed using
mxc_base.
This will
- get rid of __REG volatile assignments
- Make common reg_space by removing unneeded macros
Signed-off-by: Jagan Teki
---
drivers/serial/serial_mxc.c | 115 +++-
1 file changed, 49 insertions(+), 66 deletions(-)
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 64126e2..6d1d447 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -110,32 +110,39 @@
DECLARE_GLOBAL_DATA_PTR;
+struct mxc_uart {
+ u32 rxd;
+ u32 spare0[15];
+
+ u32 txd;
+ u32 spare1[15];
+
+ u32 cr1;
+ u32 cr2;
+ u32 cr3;
+ u32 cr4;
+
+ u32 fcr;
+ u32 sr1;
+ u32 sr2;
+ u32 esc;
+
+ u32 tim;
+ u32 bir;
+ u32 bmr;
+ u32 brc;
+
+ u32 onems;
+ u32 ts;
+};
+
#ifndef CONFIG_DM_SERIAL
#ifndef CONFIG_MXC_UART_BASE
#error "define CONFIG_MXC_UART_BASE to use the MXC UART driver"
#endif
-#define UART_PHYS CONFIG_MXC_UART_BASE
-
-#define __REG(x) (*((volatile u32 *)(x)))
-
-/* Register definitions */
-#define URXD 0x0 /* Receiver Register */
-#define UTXD 0x40 /* Transmitter Register */
-#define UCR1 0x80 /* Control Register 1 */
-#define UCR2 0x84 /* Control Register 2 */
-#define UCR3 0x88 /* Control Register 3 */
-#define UCR4 0x8c /* Control Register 4 */
-#define UFCR 0x90 /* FIFO Control Register */
-#define USR1 0x94 /* Status Register 1 */
-#define USR2 0x98 /* Status Register 2 */
-#define UESC 0x9c /* Escape Character Register */
-#define UTIM 0xa0 /* Escape Timer Register */
-#define UBIR 0xa4 /* BRM Incremental Register */
-#define UBMR 0xa8 /* BRM Modulator Register */
-#define UBRC 0xac /* Baud Rate Count Register */
-#define UTS 0xb4 /* UART Test Register (mx31) */
+#define mxc_base ((struct mxc_uart *)CONFIG_MXC_UART_BASE)
#define TXTL 2 /* reset default */
#define RXTL 1 /* reset default */
@@ -148,19 +155,20 @@ static void mxc_serial_setbrg(void)
if (!gd->baudrate)
gd->baudrate = CONFIG_BAUDRATE;
- __REG(UART_PHYS + UFCR) = (RFDIV << UFCR_RFDIV_SHF)
- | (TXTL << UFCR_TXTL_SHF)
- | (RXTL << UFCR_RXTL_SHF);
- __REG(UART_PHYS + UBIR) = 0xf;
- __REG(UART_PHYS + UBMR) = clk / (2 * gd->baudrate);
+ writel(((RFDIV << UFCR_RFDIV_SHF) |
+ (TXTL << UFCR_TXTL_SHF) |
+ (RXTL << UFCR_RXTL_SHF)),
+ &mxc_base->fcr);
+ writel(0xf, &mxc_base->bir);
+ writel(clk / (2 * gd->baudrate), &mxc_base->bmr);
}
static int mxc_serial_getc(void)
{
- while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY)
+ while (readl(&mxc_base->ts) & UTS_RXEMPTY)
WATCHDOG_RESET();
- return (__REG(UART_PHYS + URXD) & URXD_RX_DATA); /* mask out status
from upper word */
+ return (readl(&mxc_base->rxd) & URXD_RX_DATA); /* mask out status from
upper word */
}
static void mxc_serial_putc(const char c)
@@ -169,10 +177,10 @@ static void mxc_serial_putc(const char c)
if (c == '\n')
serial_putc('\r');
- __REG(UART_PHYS + UTXD) = c;
+ writel(c, &mxc_base->txd);
/* wait for transmitter to be ready */
- while (!(__REG(UART_PHYS + UTS) & UTS_TXEMPTY))
+ while (!(readl(&mxc_base->ts) & UTS_TXEMPTY))
WATCHDOG_RESET();
}
@@ -182,7 +190,7 @@ static void mxc_serial_putc(const char c)
static int mxc_serial_tstc(void)
{
/* If receive fifo is empty, return false */
- if (__REG(UART_PHYS + UTS) & UTS_RXEMPTY)
+ if (readl(&mxc_base->ts) & UTS_RXEMPTY)
return 0;
return 1;
}
@@ -194,23 +202,24 @@ static int mxc_serial_tstc(void)
*/
static int mxc_serial_init(void)
{
- __REG(UART_PHYS + UCR1) = 0x0;
- __REG(UART_PHYS + UCR2) = 0x0;
+ writel(0, &mxc_base->cr1);
+ writel(0, &mxc_base->cr2);
- while (!(__REG(UART_PHYS + UCR2) & UCR2_SRST));
+ while (!(readl(&mxc_base->cr2) & UCR2_SRST));
- __REG(UART_PHYS + UCR3) = 0x0704 | UCR3_ADNIMP;
- __REG(UART_PHYS + UCR4) = 0x8000;
- __REG(UART_PHYS + UESC) = 0x002b;
- __REG(UART_PHYS + UTIM) = 0x0;
+ writel(0x704 | UCR3_ADNIMP, &mxc_base->cr3);
+ writel(0x8000, &mxc_base->cr4);
+ writel(0x2b, &mxc_base->esc);
+ writel(0, &mxc_base->tim);
- __REG(UART_PHYS + UTS) = 0x0;
+ writel(0, &mxc_base->ts);
serial_setbrg();
- __REG(UART_PHYS + UCR2) = UCR2_WS | UCR2_IRTS | UCR2_RXEN | UCR2_TXEN |
UCR2_SRST;
+ writel(UCR2_WS | UCR2_IRTS | UCR2_RXEN | UCR2_TXEN | UCR2_SRST,
+ &mxc_base->cr2);
- __REG(UART_PHYS + UCR1) = UCR1_UARTEN;
+ writel(UCR1_UARTEN, &mxc_base->cr1);
return 0;
}
@@ -239,32 +248,6 @@ __weak struct serial_device
[U-Boot] [PATCH 3/7] serial: mxc: Move cr1 and cr2 write to mxc_serial_setbrg
From: Jagan Teki Control reg write should be part of setbrg for better buadrate generation, so move cr1 and cr2 write to mxc_serial_setbrg Signed-off-by: Jagan Teki --- drivers/serial/serial_mxc.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index 65c301d..288b610 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -162,6 +162,9 @@ static void mxc_serial_setbrg(void) writel(0xf, &mxc_base->bir); writel(clk / (2 * gd->baudrate), &mxc_base->bmr); + writel(UCR2_WS | UCR2_IRTS | UCR2_RXEN | UCR2_TXEN | UCR2_SRST, + &mxc_base->cr2); + writel(UCR1_UARTEN, &mxc_base->cr1); } static int mxc_serial_getc(void) @@ -216,11 +219,6 @@ static int mxc_serial_init(void) serial_setbrg(); - writel(UCR2_WS | UCR2_IRTS | UCR2_RXEN | UCR2_TXEN | UCR2_SRST, - &mxc_base->cr2); - - writel(UCR1_UARTEN, &mxc_base->cr1); - return 0; } -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 0/7] serial: mxc: Add debug uart support
From: Jagan Teki This set add debug uart support by cleaning up exising serial_mxc Jagan Teki (7): serial: mxc: Add common mxc_uart reg space serial: mxc: Use RFDIV in dm-code serial: mxc: Move cr1 and cr2 write to mxc_serial_setbrg serial: mxc: Move common init into _mxc_serial_init serial: mxc: Move common baud gen into _mxc_serial_setbrg serial: mxc: Code cleanup serial: mxc: Add debug uart support configs/imx6qdl_icore_mmc_defconfig | 4 + drivers/serial/Kconfig | 8 + drivers/serial/serial_mxc.c | 387 ++-- 3 files changed, 205 insertions(+), 194 deletions(-) -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] fs: usbifs: Fix warning in ubifs
Hello Michal,
Am 30.05.2017 um 14:29 schrieb Michal Simek:
From: Siva Durga Prasad Paladugu
This patch fixes the below warning by typecasting it properly
fs/ubifs/ubifs.c: In function 'ubifs_load':
fs/ubifs/ubifs.c:942:29: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]
err = ubifs_read(filename, (void *)addr, 0, size, &actread);
Signed-off-by: Siva Durga Prasad Paladugu
Signed-off-by: Michal Simek
---
fs/ubifs/ubifs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Heiko Schocher
bye,
Heiko
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index cc397d605b0e..db29489eca75 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -939,7 +939,7 @@ int ubifs_load(char *filename, u32 addr, u32 size)
printf("Loading file '%s' to addr 0x%08x...\n", filename, addr);
- err = ubifs_read(filename, (void *)addr, 0, size, &actread);
+ err = ubifs_read(filename, (void *)(uintptr_t)addr, 0, size, &actread);
if (err == 0) {
setenv_hex("filesize", actread);
printf("Done\n");
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] arm: dts: am33xx: Remove redundant interrupt-parent property
On Tuesday 06 June 2017 05:37 AM, Tom Rini wrote:
> On Tue, Jun 06, 2017 at 12:42:21AM +0530, suni...@techveda.org wrote:
>
>> From: Suniel Mahesh
>>
>> Interrupt-parent property is defined in the root node as
>> "interrupt-parent = <&intc>". This interrupt-parent value becomes
>> the default for the system, so removed redundant "interrupt-parent"
>> property from mmc, mac, lcdc and tscadc nodes.
>>
>> Signed-off-by: Suniel Mahesh
>> ---
>> arch/arm/dts/am33xx.dtsi | 6 --
>> 1 file changed, 6 deletions(-)
>>
>> diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi
>> index b26e21b..14caee7 100644
>> --- a/arch/arm/dts/am33xx.dtsi
>> +++ b/arch/arm/dts/am33xx.dtsi
>> @@ -315,7 +315,6 @@
>> &edma 25>;
>> dma-names = "tx", "rx";
>> interrupts = <64>;
>> -interrupt-parent = <&intc>;
>> reg = <0x4806 0x1000>;
>> status = "disabled";
>> };
>> @@ -328,7 +327,6 @@
>> &edma 3>;
>> dma-names = "tx", "rx";
>> interrupts = <28>;
>> -interrupt-parent = <&intc>;
>> reg = <0x481d8000 0x1000>;
>> status = "disabled";
>> };
>> @@ -338,7 +336,6 @@
>> ti,hwmods = "mmc3";
>> ti,needs-special-reset;
>> interrupts = <29>;
>> -interrupt-parent = <&intc>;
>> reg = <0x4781 0x1000>;
>> status = "disabled";
>> };
>> @@ -724,7 +721,6 @@
>> 0x4a101200 0x100>;
>> #address-cells = <1>;
>> #size-cells = <1>;
>> -interrupt-parent = <&intc>;
>> /*
>> * c0_rx_thresh_pend
>> * c0_rx_pend
>> @@ -787,7 +783,6 @@
>> lcdc: lcdc@4830e000 {
>> compatible = "ti,am33xx-tilcdc";
>> reg = <0x4830e000 0x1000>;
>> -interrupt-parent = <&intc>;
>> interrupts = <36>;
>> ti,hwmods = "lcdc";
>> status = "disabled";
>> @@ -796,7 +791,6 @@
>> tscadc: tscadc@44e0d000 {
>> compatible = "ti,am3359-tscadc";
>> reg = <0x44e0d000 0x1000>;
>> -interrupt-parent = <&intc>;
>> interrupts = <16>;
>> ti,hwmods = "adc_tsc";
>> status = "disabled";
>
> Please submit this vs the kernel and we'll sync it in that way, thanks!
>
ok thanks for the suggestion, working on it.
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] arm: ls1021atwr: Add distro secure boot support
Enable validation of boot.scr script prior to its execution dependent
on "secureboot" flag in environment. Disable fall back option to
qspi boot in case of secure boot. Also enable "secureboot=y" flag
in environment for ARM based platforms instead of bootcmd.
Signed-off-by: Sumit Garg
Tested-by: Vinitha Pillai
---
configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 1 +
.../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig| 1 +
include/configs/ls1021atwr.h | 40 --
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index 5b6ca22..9e1ab08 100644
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -44,3 +44,4 @@ CONFIG_USB_STORAGE=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_RSA=y
CONFIG_SPL_RSA=y
+CONFIG_DISTRO_DEFAULTS=y
diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
index 783787a..af9fb9c 100644
--- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@ -59,3 +59,4 @@ CONFIG_USB_STORAGE=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_RSA=y
CONFIG_SPL_RSA=y
+CONFIG_DISTRO_DEFAULTS=y
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 43767de..810e2c8 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -393,6 +393,7 @@
"fdt_addr=0x64f0\0" \
"kernel_addr=0x6500\0" \
"scriptaddr=0x8000\0" \
+ "scripthdraddr=0x8008\0"\
"fdtheader_addr_r=0x8010\0" \
"kernelheader_addr_r=0x8020\0" \
"kernel_addr_r=0x8100\0"\
@@ -402,6 +403,7 @@
"kernel_size=0x280\0" \
BOOTENV \
"boot_scripts=ls1021atwr_boot.scr\0"\
+ "boot_script_hdr=hdr_ls1021atwr_bs.out\0" \
"scan_dev_for_boot_part=" \
"part list ${devtype} ${devnum} devplist; " \
"env exists devplist || setenv devplist 1; "\
@@ -412,6 +414,21 @@
"run scan_dev_for_boot; " \
"fi; " \
"done\0"\
+ "scan_dev_for_boot=" \
+ "echo Scanning ${devtype} " \
+ "${devnum}:${distro_bootpart}...; " \
+ "for prefix in ${boot_prefixes}; do " \
+ "run scan_dev_for_scripts; " \
+ "done;" \
+ "\0" \
+ "boot_a_script=" \
+ "load ${devtype} ${devnum}:${distro_bootpart} " \
+ "${scriptaddr} ${prefix}${script}; "\
+ "env exists secureboot && load ${devtype} " \
+ "${devnum}:${distro_bootpart} " \
+ "${scripthdraddr} ${prefix}${boot_script_hdr} " \
+ "&& esbc_validate ${scripthdraddr};"\
+ "source ${scriptaddr}\0" \
"installer=load mmc 0:2 $load_addr "\
"/flex_installer_arm32.itb; " \
"bootm $load_addr#ls1021atwr\0" \
@@ -429,6 +446,7 @@
"fdt_addr=0x64f0\0" \
"kernel_addr=0x6500\0" \
"scriptaddr=0x8000\0" \
+ "scripthdraddr=0x8008\0"\
"fdtheader_addr_r=0x8010\0" \
"kernelheader_addr_r=0x8020\0" \
"kernel_addr_r=0x8100\0"\
@@ -438,6 +456,7 @@
"kernel_size=0x280\0" \
BOOTENV \
"boot_scripts=ls1021atwr_boot.scr\0"\
+ "boot_script_hdr=hdr_ls1021atwr_bs.out\0" \
"scan_dev_for_boot_part=" \
"part list ${devtype} ${devnum} devplist; " \
"env exists devplist || setenv devplist 1; "\
@@ -448,6 +467,21 @@
"run scan_dev_for_boot; " \
"fi; " \
"done\0"\
+ "scan_dev_for_boot=" \
+ "echo Scanning ${devtype} " \
+ "${devnum}:${distro_bootpart}...; " \
+ "for prefix in ${boot_prefixes}; do " \
+ "run scan_dev_for_scripts; " \
+ "done;" \
+ "\0" \
+ "boot_a_script=" \
+ "load ${devtype} $
[U-Boot] [PATCH] arm64: ls1046ardb: Add distro secure boot support
Enable validation of boot.scr script prior to its execution dependent
on "secureboot" flag in environment. Disable fall back option to
qspi boot in case of secure boot. Also enable "secureboot=y" flag
in environment for ARM based platforms instead of bootcmd.
Signed-off-by: Sumit Garg
Tested-by: Vinitha Pillai
---
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 1 +
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 +
include/configs/ls1046a_common.h| 18 ++
include/configs/ls1046ardb.h| 3 ++-
4 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
index 07bf17e..b7d8aa7 100644
--- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
@@ -36,3 +36,4 @@ CONFIG_FSL_QSPI=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_RSA=y
+CONFIG_DISTRO_DEFAULTS=y
diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
index c676266..0dd69c5 100644
--- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
@@ -45,3 +45,4 @@ CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_SPL_CRYPTO_SUPPORT=y
CONFIG_SPL_HASH_SUPPORT=y
+CONFIG_DISTRO_DEFAULTS=y
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 1820f34..053b759 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -223,9 +223,11 @@
"fdt_addr=0x64f0\0" \
"kernel_addr=0x6500\0" \
"scriptaddr=0x8000\0" \
+ "scripthdraddr=0x8008\0"\
"fdtheader_addr_r=0x8010\0" \
"kernelheader_addr_r=0x8020\0" \
"load_addr=0xa000\0"\
+ "kernel_addr_r=0x8100\0"\
"fdt_addr_r=0x9000\0" \
"ramdisk_addr_r=0xa000\0" \
"kernel_start=0x100\0" \
@@ -235,6 +237,7 @@
MTDPARTS_DEFAULT "\0" \
BOOTENV \
"boot_scripts=ls1046ardb_boot.scr\0"\
+ "boot_script_hdr=hdr_ls1046ardb_bs.out\0" \
"scan_dev_for_boot_part=" \
"part list ${devtype} ${devnum} devplist; " \
"env exists devplist || setenv devplist 1; " \
@@ -245,6 +248,21 @@
"run scan_dev_for_boot; "\
"fi; " \
"done\0" \
+ "scan_dev_for_boot=" \
+ "echo Scanning ${devtype} " \
+ "${devnum}:${distro_bootpart}...; " \
+ "for prefix in ${boot_prefixes}; do " \
+ "run scan_dev_for_scripts; " \
+ "done;" \
+ "\0" \
+ "boot_a_script=" \
+ "load ${devtype} ${devnum}:${distro_bootpart} " \
+ "${scriptaddr} ${prefix}${script}; "\
+ "env exists secureboot && load ${devtype} " \
+ "${devnum}:${distro_bootpart} " \
+ "${scripthdraddr} ${prefix}${boot_script_hdr} " \
+ "&& esbc_validate ${scripthdraddr};"\
+ "source ${scriptaddr}\0" \
"installer=load mmc 0:2 $load_addr " \
"/flex_installer_arm64.itb; " \
"bootm $load_addr#ls1046ardb\0" \
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index d906be7..88bfff3 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -241,7 +241,8 @@
#ifndef SPL_NO_MISC
#undef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND "run distro_bootcmd;run qspi_bootcmd"
+#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \
+ "&& esbc_halt; run qspi_bootcmd;"
#define MTDPARTS_DEFAULT "mtdparts=155.quadspi:1m(rcw)," \
"15m(u-boot),48m(kernel.itb);" \
"7e80.flash:16m(nand_uboot)," \
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v7 3/6] arm: socfpga: Enable FPGA driver on SPL
On Isn, 2017-06-05 at 15:00 +0200, Marek Vasut wrote: > On 06/05/2017 02:57 PM, Chee, Tien Fong wrote: > > > > On Isn, 2017-06-05 at 14:25 +0200, Marek Vasut wrote: > > > > > > On 06/05/2017 02:23 PM, Chee, Tien Fong wrote: > > > > > > > > > > > > On Isn, 2017-06-05 at 14:15 +0200, Marek Vasut wrote: > > > > > > > > > > > > > > > On 06/05/2017 02:11 PM, Chee, Tien Fong wrote: > > > > > > > > > > > > > > > > > > > > > > > > On Isn, 2017-06-05 at 14:08 +0200, Marek Vasut wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > On 06/05/2017 02:06 PM, Chee, Tien Fong wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On Isn, 2017-06-05 at 13:24 +0200, Marek Vasut wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On 06/05/2017 06:02 AM, Chee, Tien Fong wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On Isn, 2017-06-05 at 11:32 +0800, Chee, Tien Fong > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On Sab, 2017-06-03 at 13:27 +0200, Marek Vasut > > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On 05/29/2017 06:00 AM, tien.fong.c...@intel.co > > > > > > > > > > > > m > > > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > From: Tien Fong Chee > > > > > > > > > > > > m> > > > > > > > > > > > > > > > > > > > > > > > > > > This patch is for enabling the FPGA driver > > > > > > > > > > > > > support on > > > > > > > > > > > > > SPL. > > > > > > > > > > > > > > > > > > > > > > > > > > Signed-off-by: Tien Fong Chee > > > > > > > > > > > > @int > > > > > > > > > > > > > el.c > > > > > > > > > > > > > om> > > > > > > > > > > > > > --- > > > > > > > > > > > > > Â include/configs/socfpga_common.h | 1 + > > > > > > > > > > > > > Â 1 file changed, 1 insertion(+) > > > > > > > > > > > > > > > > > > > > > > > > > > diff --git a/include/configs/socfpga_common.h > > > > > > > > > > > > > b/include/configs/socfpga_common.h > > > > > > > > > > > > > index da7e4ad..e74e7eb 100644 > > > > > > > > > > > > > --- a/include/configs/socfpga_common.h > > > > > > > > > > > > > +++ b/include/configs/socfpga_common.h > > > > > > > > > > > > > @@ -110,6 +110,7 @@ > > > > > > > > > > > > > Â #define CONFIG_FPGA > > > > > > > > > > > > > Â #define CONFIG_FPGA_ALTERA > > > > > > > > > > > > > Â #define CONFIG_FPGA_SOCFPGA > > > > > > > > > > > > > +#define CONFIG_SPL_FPGA_SUPPORT > > > > > > > > > > > > This should be Kconfig symbol selected in board > > > > > > > > > > > > config. > > > > > > > > > > > > Why > > > > > > > > > > > > is > > > > > > > > > > > > it > > > > > > > > > > > > not > > > > > > > > > > > > Kconfig symbol ? > > > > > > > > > > > > > > > > > > > > > > Ahhaijust recalled there is a very important > > > > > > > > > > reason > > > > > > > > > > i > > > > > > > > > > did > > > > > > > > > > this > > > > > > > > > > because CONFIG_CMD_FPGA which is wrapping all these > > > > > > > > > > FPGA > > > > > > > > > > related > > > > > > > > > > CONFIG > > > > > > > > > > is not part of kconfig. > > > > > > > > > it is, so this is nonsense, try git grep next time > > > > > > > > > ... > > > > > > > > > cmd/Kconfig:config CMD_FPGA > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > During the build, kconfig and Macro #define are > > > > > > > > > > in two different phase/order, so we might having > > > > > > > > > > build > > > > > > > > > > issue > > > > > > > > > > during > > > > > > > > > > kconfig build(1st phase) when some Macro #define > > > > > > > > > > which > > > > > > > > > > is > > > > > > > > > > 2nd > > > > > > > > > > phase > > > > > > > > > > are > > > > > > > > > > required. > > > > > > > > > I don't understand this, but I think this is bogus. > > > > > > > > > > > > > > > > > Okay. For example, CONFIG_A in Kconfig depend on > > > > > > > > CONFIG_B > > > > > > > > which > > > > > > > > is > > > > > > > > defined in socfpga_common.h. When SPL build, CONFIG_A > > > > > > > > would > > > > > > > > not > > > > > > > > be > > > > > > > > set > > > > > > > > to one even CONFIG_B is defined to one in header f
Re: [U-Boot] [PATCH v2] arm: omap: Unify get_device_type() function
On Monday 05 June 2017 07:16 PM, Tom Rini wrote: > On Mon, Jun 05, 2017 at 04:00:35PM +0530, Lokesh Vutla wrote: >> >> >> On Friday 02 June 2017 08:30 PM, Sam Protsenko wrote: >>> Refactor OMAP3/4/5 code so that we have only one get_device_type() >>> function for all platforms. >>> >>> Details: >>> - Add ctrl variable for AM33xx and OMAP3 platforms (like it's done for >>>OMAP4/5), so we can obtain status register in common way >>> - For now ctrl structure for AM33xx/OMAP3 contains only status register >>>address >>> - Run hw_data_init() in order to assign ctrl to proper structure >>> - Remove DEVICE_MASK and DEVICE_GP definitions as they are not used >>>(DEVICE_TYPE_MASK and GP_DEVICE are used instead) >>> - Guard structs in omap_common.h with #ifndefs, because otherwise >>>including omap_common.h in am33xx board files breaks compilation >>> >>> Buildman script was run for all OMAP boards. Result output: >>> arm: (for 38/616 boards) >>> all +352.5 >>> bss -1.4 >>> data +3.5 >>> rodata +300.0 >>> spl/u-boot-spl:all +284.7 >>> spl/u-boot-spl:data +2.2 >>> spl/u-boot-spl:rodata +252.0 >>> spl/u-boot-spl:text +30.5 >>> text +50.4 >>> (no errors to report) >>> >>> Tested on AM57x EVM and BeagleBoard xM. >>> >>> Signed-off-by: Sam Protsenko >> >> Reviewed-by: Lokesh Vutla >> >> Will you be able to test on BeagleBoneBlack as well? > > I tested v1 of this on am335x-gp-evm. I don't have BBB in my automatic This is fine. I just want to make sure am335x is not broken :) Thanks and regards, Lokesh > lab due to how it's powered, and that I only have 1 of those USB hubs I > can control power on each port on. :( > ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] spi: Drop atmel_dataflash_spi.c
On Mon, Jun 05, 2017 at 09:32:28PM +0200, Stelian Pop wrote: > Hi everybody, > > > The problem here is that you need to remove the boards in question as > > well. I see the baord maintainer was Cc'd on this email, so this is a > > bit stronger of a poke, as I guess we need to drop these boards.. > > It looks like I'm still listed as the maintainer, although I haven't > been involved in u-boot development for years... > > I no longer have access to any AT91 board, so if someone wants to take > over, it's ok to me. Otherwise, you can mark those boards as orphaned, > or remove them from the tree. Thanks Stelian. Wenyou, you've done some changes to some of these boards recently, would you care to pick them up, or should I go ahead and remove them? Thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [ANN] U-Boot v2017.07-rc1 released
Hey all, So it's release day and I've put up v2017.07-rc1. The merge window is now closed and I've updated git and the tarballs are also up now. As is often the case, my queue needs a bit of cleaning up still and as per the schedule, I plan to do -rc2 on the 19th of this month. There's a few changes that should probably come in still that might be a bit disruptive but I think are mostly SoC-centric in their potential to disrupt so I'll likely still pull them in. I'm also expecting some "big" changes to come in that remove various boards/SoCs that haven't been active in a while and will help make our various migrations a bit easier. Thanks all! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] DNS Lookup in UBoot
U-boot support DHCP, however beyond the initial set of results returned, many are optional, and even misused. Microsoft's DHCP server appears to have a limited mechanism to set DHCP responses. Because u-boot runs on "smart" devices and has a scripting language (a brilliant one if I may so so) Can we get a DNS lookup command to resolved names after the initial DHCP IP address setup. This is to get a flexible mechanism to set a bootserver address, consistent for Uboot across DHCP implementations. Duncan Hare 714 931 7952 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] cmd/ethsw: Disable implicit enum conversion warning
On Sun, May 28, 2017 at 08:49:51AM -0400, Tom Rini wrote: > With clang-3.8 we see warnings like: > cmd/ethsw.c:304:6: warning: implicit conversion from > enumeration type 'enum ethsw_keyword_opt_id' to different enumeration > type > 'enum ethsw_keyword_id' [-Wenum-conversion] > ethsw_id_pvid_no, > ^~~~ > > Because we have one enum for ethsw_keyword_id and a second enum for > ethsw_keyword_opt_id. This ends up being safe as ethsw_keyword_opt_id > explicitly starts after ethsw_keyword_id enum ends. Disable the > warning here rather than collapse these into one enum and rely on > comments to denote where optional keywords begin. > > Cc: Codrin Ciubotariu > Cc: Joe Hershberger > Signed-off-by: Tom Rini > Acked-by: Joe Hershberger Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PULL] u-boot-usb/master
The following changes since commit 46bac66b20da6d50e757bdca74703153f233090b: sandbox: Move to use live tree (2017-06-01 07:03:17 -0600) are available in the git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 2cb7b900f42ad796b8dc50afe8379bbda64e80e9: ehci-pci: Prepare for usage of readl()/writel() accessors (2017-06-05 13:42:09 +0200) Alexey Brodkin (1): ehci-pci: Prepare for usage of readl()/writel() accessors Phil Edworthy (1): dfu: dfu_sf: Fix read offset Sam Protsenko (1): fastboot: Add support for flashing zImage common/fb_mmc.c | 168 drivers/dfu/dfu_sf.c| 3 +- drivers/usb/host/ehci-pci.c | 1 + 3 files changed, 171 insertions(+), 1 deletion(-) ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,11/38] samsung: usb: Drop ohci-s3c24xx driver
On 06/06/2017 02:18 AM, Tom Rini wrote: > On Wed, May 17, 2017 at 08:22:44AM -0600, Simon Glass wrote: > >> This is not used anymore. Drop it. >> >> Signed-off-by: Simon Glass > > Applied to u-boot/master, thanks! > This should have gone through u-boot-usb/master , but clearly , you again violated our agreement to not bypass the structure and apply USB patches directly. Please see my email off-list for I am reaching my limit. -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] arm64: hikey: Fix instructions in readme
On Wed, May 31, 2017 at 11:28:30AM +0200, Michal Simek wrote: > Fix inaccurate instructions in README. > > Signed-off-by: Michal Simek Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/1] reset: sti: add deassert counter in reset channel descriptor
On Thu, May 18, 2017 at 09:58:00AM +0200, Patrice Chotard wrote: > From: Patrice Chotard > > This deassert counter allow to manage "shared" reset lines > encountered in some specific case. On STiH410 SoC, DWC3, > EHCI and OHCI are all using a respective PHY, but all of > these PHYs shared a "global" reset. > > Currently, during command "usb stop", all host controller are > stopped (XHCI, EHCI and OHCI). XHCI is first shutdowned, which > means that PHY global reset is asserted. Then EHCI is shutdowned, > but its PHY reset has already been asserted which make handshake() > call failed in ehci_shutdown(). > > This counter allows to really assert a reset lines only when the > "last" user is asserting it. > > Signed-off-by: Patrice Chotard > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 08/15] bootstage: Use debug() for stashing messages
On Mon, May 22, 2017 at 05:05:29AM -0600, Simon Glass wrote: > We don't normally want to see these messages. Change them to debug-only. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 38/38] common: microblaze: Drop arch-specific declarations
On Wed, May 17, 2017 at 08:23:11AM -0600, Simon Glass wrote: > These are not needed and should not be in common.h. Drop them. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 1/2] test: py: Use global pytestmark for hush tests
On Thu, May 18, 2017 at 09:23:14AM +0200, Michal Simek wrote: > All tests in test_hush_if_test depends on hush parser to be > present. This patch simplify test dependencies by using global > pytestmark. > > Reported-by: Stephen Warren > Signed-off-by: Michal Simek > Acked-by: Stephen Warren Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 28/38] arm: Remove include files from common.h
On Wed, May 17, 2017 at 08:23:01AM -0600, Simon Glass wrote: > With a small tweak we can avoid including these files for all boards. > > Signed-off-by: Simon Glass > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 32/38] common: powerpc: Move arch-specific headers
On Wed, May 17, 2017 at 08:23:05AM -0600, Simon Glass wrote: > Set up a new asm/ppc.h header file to hold this arch-specific stuff. It > should not be in common.h. It probably should be refactored to use > asm/arch instead, but that is a job for the maintainer. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] arm64: Add NOLOAD attribute NOLOAD to .bss sections
On Mon, May 29, 2017 at 10:26:53AM +0200, Michal Simek wrote: > Mark explicitly bss sections to not be loaded at > run time. > The similar patch was done in past by: > "Fix linker scripts: add NOLOAD atribute to .bss/.sbss sections" > (sha1: 64134f011254123618798ff77c42ba196b2ec485) > > The problem is related to latest toolchain added to Xilinx > v2017.1 design tools where jtag loader is trying to access > ununitialized memory. > > Signed-off-by: Michal Simek Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 05/15] bootstage: Fix up code style and comments
On Mon, May 22, 2017 at 05:05:26AM -0600, Simon Glass wrote: > There are several code style and comment nits. Fix them and also remove > the comment about passing bootstage to the kernel being TBD. This is > already supported. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, v3] ARM: ti: Update layout for MMC and eMMC (env and dfu)
On Wed, May 24, 2017 at 12:08:27PM +0200, Jean-Jacques Hiblot wrote: > The problems with the current DFU layout are: > MMC: The space allocated for u-boot is too small for the latest u-boot > (>750KB). We need to increase it. eMMC uses a much bigger area (2MB). > eMMC: region "u-boot.img.raw" overlaps the environment area and the region > "spl-os-image.raw". > both: region "spl-os-image.raw" is quite small and can't handle android > kernels > > Fixing this requires growing some regions and moving others. > Care has been taken to leave some room for further growth of > "spl-os-args.raw". > Also the "env" now appears in the dfu so that it's apparent that the > region is not free space that can be used to grow "u-boot.img.raw". > The MLO region is 0x100 sectors wide but the 0x100 are unused in case the > MLO comes too overflow this areas. > The total space allocated for those raw binaries is 16MB, of which 13+MB > are reserved for the kernel image. > > Signed-off-by: Jean-Jacques Hiblot > Reviewed-by: Tom Rini > Reviewed-by: Sam Protsenko Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/2] arm: Add Kconfig symbols used for Linux asm compatibility
On Thu, Jun 01, 2017 at 07:33:28AM +0100, Phil Edworthy wrote: > Rather than change asm files that come from Linux, add the symbols > to Kconfig. Since one of the symbols is for thumb2 builds, make > CPU_V7M always select them. > > Signed-off-by: Phil Edworthy Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,04/15] bootstage: Convert to use malloc()
On Mon, May 22, 2017 at 05:05:25AM -0600, Simon Glass wrote: > At present bootstage uses the data section of the image to store its > information. There are a few problems with this: > > - It does not work on all boards (e.g. those which run from flash before > relocation) > - Allocated strings still point back to the pre-relocation data after > relocation > > Now that U-Boot has a pre-relocation malloc() we can use this instead, > with a pointer to the data in global_data. Update bootstage to do this and > set up an init routine to allocate the memory. > > Now that we have a real init function, we can drop the fake 'reset' record > and add a normal one instead. > > Note that part of the problem with allocated strings remains. They are > reallocated but this will only work where pre-relocation memory is > accessible after relocation. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] drivers: ram: stm32: fix compilation issue
On Tue, May 30, 2017 at 03:06:31PM +0200, Patrice Chotard wrote: > From: Patrice Chotard > > If CONFIG_CLK flag is not set, compilation raises the > following error message: > > drivers/ram/stm32_sdram.c: In function 'stm32_fmc_probe': > drivers/ram/stm32_sdram.c:154:2: error: 'ret' undeclared (first use in this > function) > ret = stm32_sdram_init(dev); > > Signed-off-by: Patrice Chotard > cc: Vikas Manocha Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 07/15] bootstage: Show records with a zero time
On Mon, May 22, 2017 at 05:05:28AM -0600, Simon Glass wrote: > We can now use the record count to determine whether a record is valid or > not. Drop the test for a zero time. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 14/38] arc: Make u-boot-arc.h a private header
On Wed, May 17, 2017 at 08:22:47AM -0600, Simon Glass wrote: > Rather than including this arch-specific header file in common.h, include > it from within arc's u-boot.h header. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] malloc: Turn on DEBUG when enabling unit tests
On Thu, May 25, 2017 at 07:24:06PM +0300, Pantelis Antoniou wrote: > Unit tests require mallinfo which in turn requires DEBUG on > dlmalloc to be enabled. > > The dependancy on CONFIG_SANDBOX is wrong. > > Signed-off-by: Pantelis Antoniou > Reviewed-by: Tom Rini > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] arm: Always keep the dtb section on objcopy
On Thu, May 25, 2017 at 07:23:58PM +0300, Pantelis Antoniou wrote: > The dtb blob section must always be present in the resulting image. > Either if OF_EMBEDED is used or if unit tests include dtb blobs. > > Signed-off-by: Pantelis Antoniou > Reviewed-by: Tom Rini > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] cmd/elf.c: Support passing arguments with bootelf
On Thu, May 18, 2017 at 05:03:07PM -0400, Tom Rini wrote: > The bootelf command could, but does not, pass additional arguments along > on the command line. Make do_bootelf consume bootelf/flags/address as > needed and then pass along anything else to the ELF application we've > launched. > > Reported-by: Thomas Doerfler > Signed-off-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 16/38] x86: Make u-boot-x86.h a private header
On Wed, May 17, 2017 at 08:22:49AM -0600, Simon Glass wrote: > Rather than including this arch-specific header file in common.h, include > it from within x86's u-boot.h header. > > Also drop the comment about something to be fixed. It is not clear what > needs fixing. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 20/38] arc: Don't include asm/u-boot.h in common
On Wed, May 17, 2017 at 08:22:53AM -0600, Simon Glass wrote: > This is not actually needed anywhere, so drop it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,14/15] bootstage: Support SPL
On Mon, May 22, 2017 at 05:05:35AM -0600, Simon Glass wrote: > At present bootstage only supports U-Boot proper. But SPL can also consume > boot time so it is useful to have the record start there. > > Add bootstage support to SPL. Also support stashing the timing information > when SPL finishes so that it can be picked up and reported by U-Boot > proper. This provides a full boot time record, excluding only the time > taken by the boot ROM. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 31/38] common: Move PPC4xx_SYS_INFO() et al to arch-specific header
On Wed, May 17, 2017 at 08:23:04AM -0600, Simon Glass wrote: > These definitions should not be in common.h. Move them to an arch-specific > header file. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 36/38] common: arm: davinci: Move header file out of common
On Wed, May 17, 2017 at 08:23:09AM -0600, Simon Glass wrote: > We should not have an arch-specific header file in common.h. Instead, use > the asm/hardware.h header to provide the required declarations, and drop > the common.h changes. > > Signed-off-by: Simon Glass > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 30/38] common: Drop determine_sysper() and determine_pci_clock_per()
On Wed, May 17, 2017 at 08:23:03AM -0600, Simon Glass wrote: > These arch-specific declarations should not be in common.h. Drop them. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 17/38] arm: Make u-boot-arm.h a private header
On Wed, May 17, 2017 at 08:22:50AM -0600, Simon Glass wrote: > Rather than including this arch-specific header file in common.h, include > it from within arm's u-boot.h header. > > Also drop the comment about something to be fixed. It has been there > forever and it is not clear what it means. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 13/15] bootstage: Adjust to use const * where possible
On Mon, May 22, 2017 at 05:05:34AM -0600, Simon Glass wrote: > There are a few places that should use const *, such as > bootstage_unstash(). Update these to make it clearer when parameters are > changed. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,29/38] common: Drop cpu_init_f() declarations
On Wed, May 17, 2017 at 08:23:02AM -0600, Simon Glass wrote: > These arch-specific functions are not needed here. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 06/15] bootstage: Use rec_count as the array index
On Mon, May 22, 2017 at 05:05:27AM -0600, Simon Glass wrote: > At present bootstage has a large array with all possible bootstage IDs > recorded. It adds times to the array element indexed by the ID. This is > inefficient because many IDs are not used during boot. We can save space > by only recording those IDs which actually have timestamps. > > Update the array to use a record count, which increments with each > addition of a new timestamp. This takes longer to record a time, since it > may involve an array search. Such a search may be particularly expensive > before relocation when the CPU is running slowly or the cache is off. But > at that stage there should be very few records. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,10/15] bootstage: Init as early as possible
On Mon, May 22, 2017 at 05:05:31AM -0600, Simon Glass wrote: > At present we don't allow use of bootstage before driver model is running. > This means we cannot time the init of driver model itself. > > Now that bootstage requires its own board-specific timer, we can move its > init to earlier in the sequence, both before and after relocation. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 4/4] arm: am57xx: cl-som-am57x: adjust default env to the installation system
On Wed, May 17, 2017 at 05:29:28PM +0300, Uri Mashiach wrote: > The SD card automatic installation system depends on the default > environment of the previous U-Boot. > > Add the missing environment variables. > > Signed-off-by: Uri Mashiach > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/4] arm: am57xx: cl-som-am57x: support for FS boot
On Wed, May 17, 2017 at 05:29:25PM +0300, Uri Mashiach wrote: > Supported boot devices are raw QSPI and raw SD card. > Add support for a FAT16/32 file system for SD card. > > The SOC's boot ROM only supports FAT file system. > Therefore remove the SPL support for the EXT file system. > > Signed-off-by: Uri Mashiach > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 34/38] common: freescale: Move arch-specific imx code to arch-imx
On Wed, May 17, 2017 at 08:23:07AM -0600, Simon Glass wrote: > These declarations should not be in common.h. Move them to an > arch-specific header. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] common/spl/Kconfig: Use 'if SPL' / 'if TPL' guards
On Mon, May 22, 2017 at 07:21:57PM +, Tom Rini wrote: > Much of the entries here simply depend on SPL (or TPL). Instead of this > redundancy use if SPL / if TPL to guard the rest of the choices and only > show them when we have the relevant option enabled. > > Signed-off-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 22/38] sandbox: Don't include asm/u-boot.h in common
On Wed, May 17, 2017 at 08:22:55AM -0600, Simon Glass wrote: > This is not actually needed anywhere, so drop it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 3/4] ARM: am57xx: cl-som-am57x: support for AM5718
On Wed, May 17, 2017 at 05:29:27PM +0300, Uri Mashiach wrote: > Disable SDRAM controller EMIF2 for single core SOC > Set SDRAM size size to 1GB > > Signed-off-by: Uri Mashiach > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 26/38] arm: Add declarations to avoid needing to include headers
On Wed, May 17, 2017 at 08:22:59AM -0600, Simon Glass wrote: > At present common.h includes various ARM-specific headers. In preparation > for dropping this, add a few explicit declarations. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 19/38] nds32: Make u-boot-nds32.h a private header
On Wed, May 17, 2017 at 08:22:52AM -0600, Simon Glass wrote: > Rather than including this arch-specific header file in common.h, include > it from within nds32's u-boot.h header. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCHv2] ARMv8: Add support for poweroff via PSCI
On Mon, Jun 05, 2017 at 11:43:19AM -0400, Tom Rini wrote: > From: Michal Simek > > Add support for calling poweroff in case of psci is wired. > Based on the same solution as is used for reset. > > Signed-off-by: Michal Simek > Reviewed-by: Simon Glass > [trini: Move all logic in to fwcall.c as other ARMs implement poweroff > via PMIC] > Signed-off-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,v3,2/2] armv7m: Fix larger builds
On Thu, Jun 01, 2017 at 07:33:29AM +0100, Phil Edworthy wrote: > The branch instruction only has an 11-bit relative target address, which > is sometimes not enough. > > Signed-off-by: Phil Edworthy Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 15/15] bootstage: Record time taken to set up the live device tree
On Mon, May 22, 2017 at 05:05:36AM -0600, Simon Glass wrote: > This time is interesting as a comparision with the flat device tree time. > Add it to the record. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 12/38] samsung: nand: Drop s3c2410_nand driver
On Wed, May 17, 2017 at 08:22:45AM -0600, Simon Glass wrote: > This is not used anymore. Drop it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,v2,2/2] test: py: hush: Add echo dependency
On Thu, May 18, 2017 at 09:23:15AM +0200, Michal Simek wrote: > Some tests depends on echo command to be present. > > Reported-by: Stephen Warren > Signed-off-by: Michal Simek Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 08/38] gpio: samsung: Drop s3c2440_gpio driver
On Wed, May 17, 2017 at 08:22:41AM -0600, Simon Glass wrote: > This is no longer used in U-Boot. Drop it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 02/15] bootstage: Require timer_get_boot_us() to be defined
On Mon, May 22, 2017 at 05:05:23AM -0600, Simon Glass wrote: > At present we provide a default version of this function for use by > bootstage. However it uses the system timer and therefore likely requires > driver model. This makes it impossible to time driver-model init. > > Drop the function and require boards to provide their own. Add a sandbox > version also. There is a default implememtation in lib/time.c for boards > which use CONFIG_SYS_TIMER_COUNTER. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] ARM: k2g: Fix passing main pll info for higher speeds
On Sat, May 20, 2017 at 05:49:27AM +0530, Lokesh Vutla wrote: > Main pll is marked as arm plls for higher speeds. Fix this. > > Signed-off-by: Lokesh Vutla Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 18/38] mips: Make u-boot-mips.h a private header
On Wed, May 17, 2017 at 08:22:51AM -0600, Simon Glass wrote: > Rather than including this arch-specific header file in common.h, include > it from within mips's u-boot.h header. > > Signed-off-by: Simon Glass > Reviewed-by: Daniel Schwierzeck Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 37/38] common: arm: freescale: layerscape: Move header files out of common.h
On Wed, May 17, 2017 at 08:23:10AM -0600, Simon Glass wrote: > We should not have an arch-specific header file in common.h. Adjust the > board files a little so it is not needed, and drop it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 11/15] bootstage: Record the time taken to set up driver model
On Mon, May 22, 2017 at 05:05:32AM -0600, Simon Glass wrote: > Driver model is set up ones before relocation and once after. Record the > time taken in each case. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 09/15] bootstage: Support relocating boostage data
On Mon, May 22, 2017 at 05:05:30AM -0600, Simon Glass wrote: > Some boards cannot access pre-relocation data after relocation. Reserve > space for this and copy it during preparation for relocation. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 03/15] bootstage: Change CONFIG_BOOTSTAGE_USER_COUNT to an int
On Mon, May 22, 2017 at 05:05:24AM -0600, Simon Glass wrote: > There is no good read to make this hex, and integer is more natural for > this type of setting. Update it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 13/38] samsung: Drop more references fo s3c24x0
On Wed, May 17, 2017 at 08:22:46AM -0600, Simon Glass wrote: > This is dead code now. Drop it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] board: ti: am571-idx: Add vcores support
On Thu, May 25, 2017 at 03:37:34PM +0530, Keerthy wrote: > Update vcores for am571-idk board. > > Reported-by: Steve Kipisz > Signed-off-by: Keerthy > Signed-off-by: Lokesh Vutla > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 21/38] mips: Don't include asm/u-boot.h in common
On Wed, May 17, 2017 at 08:22:54AM -0600, Simon Glass wrote: > This is not actually needed anywhere, so drop it. > > Signed-off-by: Simon Glass > Reviewed-by: Daniel Schwierzeck Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 05/38] common: Move pcie_setup_hoses() to PPC header
On Wed, May 17, 2017 at 08:22:38AM -0600, Simon Glass wrote: > Only one board needs this definition. Move it to an arch-specific header. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,12/15] bootstage: Tidy up error return values
On Mon, May 22, 2017 at 05:05:33AM -0600, Simon Glass wrote: > We should return a proper error number instead of just -1. This helps the > caller to determine what when wrong. Update a few functions to fix this. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 2/4] arm: am57xx: cl-som-am57x: change the shell prompt
On Wed, May 17, 2017 at 05:29:26PM +0300, Uri Mashiach wrote: > Change the shell prompt to "U-Boot# ". > > Signed-off-by: Uri Mashiach > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 15/38] sandbox: Make u-boot-sandbox.h a private header
On Wed, May 17, 2017 at 08:22:48AM -0600, Simon Glass wrote: > Rather than including this arch-specific header file in common.h, include > it from within sandbox's u-boot.h header. > > Also drop the comment about something to be fixed. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 35/38] common: ep93xx: Move arch-specific declarations out of common
On Wed, May 17, 2017 at 08:23:08AM -0600, Simon Glass wrote: > These declarations should not be in common. Remove those that are not > needed and move the others to an arch-specific location. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 06/38] common: Move get_OPB_freq() and get_PCI_freq() to PPC header
On Wed, May 17, 2017 at 08:22:39AM -0600, Simon Glass wrote: > These should not be in common.h. Move the to an arch-specific header. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] scripts/Makefile.lib: Only apply u-boot.dtsi files in the target directory
On Wed, May 24, 2017 at 11:04:03AM -0400, Tom Rini wrote: > We only want to apply files such as 'omap5-u-boot.dtsi', which resides > in arch/arm/dts/ to other files in arch/arm/dts/ and not say > test/overlay/. Rework the make logic to check for -u-boot.dtsi files in > the same directory as their target dts. > > Cc: Simon Glass > Reported-by: Pantelis Antoniou > Signed-off-by: Tom Rini > Tested-by: Pantelis Antoniou > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 12/38] samsung: nand: Drop s3c2410_nand driver
On Wed, May 17, 2017 at 08:22:45AM -0600, Simon Glass wrote: > This is not used anymore. Drop it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 23/38] x86: Don't include asm/u-boot.h in common
On Wed, May 17, 2017 at 08:22:56AM -0600, Simon Glass wrote: > With a small fixup to u-boot-x86.h, this is not actually needed anywhere, > so drop it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 24/38] nds32: Remove include files from common.h
On Wed, May 17, 2017 at 08:22:57AM -0600, Simon Glass wrote: > With a few tweaks we can avoid including these files, which are only > needed by two C files. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 01/15] bootstage: Provide a default timer function
On Mon, May 22, 2017 at 05:05:22AM -0600, Simon Glass wrote: > If CONFIG_SYS_TIMER_COUNTER is used we can provide a default microsecond > timer implementation. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,10/38] samsung: mmc: Drop s3c_sdi driver
On Wed, May 17, 2017 at 08:22:43AM -0600, Simon Glass wrote: > This is no-longer used in U-Boot. Drop it. > > Signed-off-by: Simon Glass > Reviewed-by: Jaehoon Chung Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 33/38] common: freescale: Move arch-specific declarations
On Wed, May 17, 2017 at 08:23:06AM -0600, Simon Glass wrote: > The declarations should not be in common.h. Move them to the arch-specific > headers. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,04/38] common: Drop pci_master_init()
On Wed, May 17, 2017 at 08:22:37AM -0600, Simon Glass wrote: > This should not be in common.h. Drop it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 03/38] common: Move pci_target_init() to PPC header
On Wed, May 17, 2017 at 08:22:36AM -0600, Simon Glass wrote: > Only one boards needs this definition. Move it to an arch-specific header. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,27/38] arm: Include asm/setup.h explictly
On Wed, May 17, 2017 at 08:23:00AM -0600, Simon Glass wrote: > Include this header where needed so we do not need to rely on common.h. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 09/38] samsung: Drop s3c24x0 arch-specific code
On Wed, May 17, 2017 at 08:22:42AM -0600, Simon Glass wrote: > This is not used anymore. Drop it. > > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
