[U-Boot] [PATCH 1/2] Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
This reverts commit c0434407b595f785fc7401237896c48c791b45fd.
It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot.
Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com ---
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
diff --git a/common/board_f.c b/common/board_f.c index 213d044..afafec5 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -11,7 +11,6 @@
#include <common.h> #include <console.h> -#include <cpu.h> #include <dm.h> #include <environment.h> #include <fdtdec.h> @@ -166,33 +165,6 @@ static int print_resetinfo(void) } #endif
-#if defined(CONFIG_DISPLAY_CPUINFO) && CONFIG_IS_ENABLED(CPU) -static int print_cpuinfo(void) -{ - struct udevice *dev; - char desc[512]; - int ret; - - ret = uclass_first_device_err(UCLASS_CPU, &dev); - if (ret) { - debug("%s: Could not get CPU device (err = %d)\n", - __func__, ret); - return ret; - } - - ret = cpu_get_desc(dev, desc, sizeof(desc)); - if (ret) { - debug("%s: Could not get CPU description (err = %d)\n", - dev->name, ret); - return ret; - } - - printf("%s", desc); - - return 0; -} -#endif - static int announce_dram_init(void) { puts("DRAM: "); diff --git a/include/init.h b/include/init.h index afc953d..a58d7a6 100644 --- a/include/init.h +++ b/include/init.h @@ -109,14 +109,7 @@ int arch_reserve_stacks(void); */ int init_cache_f_r(void);
-#if !CONFIG_IS_ENABLED(CPU) -/** - * print_cpuinfo() - Display information about the CPU - * - * Return: 0 if OK, -ve on error - */ int print_cpuinfo(void); -#endif int timer_init(void); int reserve_mmu(void); int misc_init_f(void);
Due to revert of commit c0434407b595, this board does not build any more. Disable CONFIG_DISPLAY_CPUINFO for v2018.11 release.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com ---
configs/imx8qxp_mek_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 1588416..a45f3ba 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_IMX8QXP_MEK=y CONFIG_NR_DRAM_BANKS=3 CONFIG_BOOTDELAY=3 +# CONFIG_DISPLAY_CPUINFO is not set CONFIG_CMD_CPU=y # CONFIG_CMD_IMPORTENV is not set CONFIG_CMD_CLK=y
-----Original Message----- From: Bin Meng [mailto:bmeng.cn@gmail.com] Sent: 2018年11月7日 19:51 To: Tom Rini trini@konsulko.com; Simon Glass sjg@chromium.org; U-Boot Mailing List u-boot@lists.denx.de Cc: Mario Six mario.six@gdsys.cc; Peng Fan peng.fan@nxp.com Subject: [PATCH 2/2] imx8qxp_mek: Disable CONFIG_DISPLAY_CPUINFO
Due to revert of commit c0434407b595, this board does not build any more. Disable CONFIG_DISPLAY_CPUINFO for v2018.11 release.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Acked-by: Peng Fan peng.fan@nxp.com
configs/imx8qxp_mek_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 1588416..a45f3ba 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_IMX8QXP_MEK=y CONFIG_NR_DRAM_BANKS=3 CONFIG_BOOTDELAY=3 +# CONFIG_DISPLAY_CPUINFO is not set CONFIG_CMD_CPU=y # CONFIG_CMD_IMPORTENV is not set CONFIG_CMD_CLK=y -- 2.7.4
On 7 November 2018 at 04:50, Bin Meng bmeng.cn@gmail.com wrote:
Due to revert of commit c0434407b595, this board does not build any more. Disable CONFIG_DISPLAY_CPUINFO for v2018.11 release.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
configs/imx8qxp_mek_defconfig | 1 + 1 file changed, 1 insertion(+)
Reviewed-by: Simon Glass sjg@chromium.org
On Wed, Nov 07, 2018 at 03:50:35AM -0800, Bin Meng wrote:
Due to revert of commit c0434407b595, this board does not build any more. Disable CONFIG_DISPLAY_CPUINFO for v2018.11 release.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Acked-by: Peng Fan peng.fan@nxp.com Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
-----Original Message----- From: Bin Meng [mailto:bmeng.cn@gmail.com] Sent: 2018年11月7日 19:51 To: Tom Rini trini@konsulko.com; Simon Glass sjg@chromium.org; U-Boot Mailing List u-boot@lists.denx.de Cc: Mario Six mario.six@gdsys.cc; Peng Fan peng.fan@nxp.com Subject: [PATCH 1/2] Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
This reverts commit c0434407b595f785fc7401237896c48c791b45fd.
It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot.
Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Acked-by: Peng Fan peng.fan@nxp.com
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
diff --git a/common/board_f.c b/common/board_f.c index 213d044..afafec5 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -11,7 +11,6 @@
#include <common.h> #include <console.h> -#include <cpu.h> #include <dm.h> #include <environment.h> #include <fdtdec.h> @@ -166,33 +165,6 @@ static int print_resetinfo(void) } #endif
-#if defined(CONFIG_DISPLAY_CPUINFO) && CONFIG_IS_ENABLED(CPU) -static int print_cpuinfo(void) -{
- struct udevice *dev;
- char desc[512];
- int ret;
- ret = uclass_first_device_err(UCLASS_CPU, &dev);
- if (ret) {
debug("%s: Could not get CPU device (err = %d)\n",__func__, ret);return ret;- }
- ret = cpu_get_desc(dev, desc, sizeof(desc));
- if (ret) {
debug("%s: Could not get CPU description (err = %d)\n",dev->name, ret);return ret;- }
- printf("%s", desc);
- return 0;
-} -#endif
static int announce_dram_init(void) { puts("DRAM: "); diff --git a/include/init.h b/include/init.h index afc953d..a58d7a6 100644 --- a/include/init.h +++ b/include/init.h @@ -109,14 +109,7 @@ int arch_reserve_stacks(void); */ int init_cache_f_r(void);
-#if !CONFIG_IS_ENABLED(CPU) -/**
- print_cpuinfo() - Display information about the CPU
- Return: 0 if OK, -ve on error
- */
int print_cpuinfo(void); -#endif int timer_init(void); int reserve_mmu(void); int misc_init_f(void); -- 2.7.4
On 7 November 2018 at 04:50, Bin Meng bmeng.cn@gmail.com wrote:
This reverts commit c0434407b595f785fc7401237896c48c791b45fd.
It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot.
Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
Thanks Bin. I'd like to get u-boot-dm/next set up ready for the merge window, so I presume in that we need to un-revert these changes and then pick up your two series?
Reviewed-by: Simon Glass sjg@chromium.org
Hi Simon,
On Thu, Nov 8, 2018 at 1:09 AM Simon Glass sjg@chromium.org wrote:
On 7 November 2018 at 04:50, Bin Meng bmeng.cn@gmail.com wrote:
This reverts commit c0434407b595f785fc7401237896c48c791b45fd.
It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot.
Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
Thanks Bin. I'd like to get u-boot-dm/next set up ready for the merge window, so I presume in that we need to un-revert these changes and then pick up your two series?
That is correct. I can help test u-boot-dm/next.
Reviewed-by: Simon Glass sjg@chromium.org
Regards, Bin
Hi Bin,
On 7 November 2018 at 17:24, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Thu, Nov 8, 2018 at 1:09 AM Simon Glass sjg@chromium.org wrote:
On 7 November 2018 at 04:50, Bin Meng bmeng.cn@gmail.com wrote:
This reverts commit c0434407b595f785fc7401237896c48c791b45fd.
It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot.
Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
Thanks Bin. I'd like to get u-boot-dm/next set up ready for the merge window, so I presume in that we need to un-revert these changes and then pick up your two series?
That is correct. I can help test u-boot-dm/next.
OK thank you. It is ready there now.
Regards, Simon
Hi Simon,
On Mon, Nov 12, 2018 at 11:25 AM Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 7 November 2018 at 17:24, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Thu, Nov 8, 2018 at 1:09 AM Simon Glass sjg@chromium.org wrote:
On 7 November 2018 at 04:50, Bin Meng bmeng.cn@gmail.com wrote:
This reverts commit c0434407b595f785fc7401237896c48c791b45fd.
It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot.
Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
Thanks Bin. I'd like to get u-boot-dm/next set up ready for the merge window, so I presume in that we need to un-revert these changes and then pick up your two series?
That is correct. I can help test u-boot-dm/next.
OK thank you. It is ready there now.
Do you mean u-boot-dm/next? It looks to me the repo was updated 7 days ago.
Regards, Bin
Hi Bin,
On 11 November 2018 at 21:55, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Mon, Nov 12, 2018 at 11:25 AM Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 7 November 2018 at 17:24, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Thu, Nov 8, 2018 at 1:09 AM Simon Glass sjg@chromium.org wrote:
On 7 November 2018 at 04:50, Bin Meng bmeng.cn@gmail.com wrote:
This reverts commit c0434407b595f785fc7401237896c48c791b45fd.
It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot.
Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
Thanks Bin. I'd like to get u-boot-dm/next set up ready for the merge window, so I presume in that we need to un-revert these changes and then pick up your two series?
That is correct. I can help test u-boot-dm/next.
OK thank you. It is ready there now.
Do you mean u-boot-dm/next? It looks to me the repo was updated 7 days ago.
Sorry u-boot-dm/testing. However I have pushed it to u-boot-dm/master now.
If you are sending new patches, can you please base on that?
Regards, Simon
Hi Simon,
On Mon, Nov 12, 2018 at 9:58 PM Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 11 November 2018 at 21:55, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Mon, Nov 12, 2018 at 11:25 AM Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 7 November 2018 at 17:24, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Thu, Nov 8, 2018 at 1:09 AM Simon Glass sjg@chromium.org wrote:
On 7 November 2018 at 04:50, Bin Meng bmeng.cn@gmail.com wrote:
This reverts commit c0434407b595f785fc7401237896c48c791b45fd.
It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot.
Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
Thanks Bin. I'd like to get u-boot-dm/next set up ready for the merge window, so I presume in that we need to un-revert these changes and then pick up your two series?
That is correct. I can help test u-boot-dm/next.
OK thank you. It is ready there now.
Do you mean u-boot-dm/next? It looks to me the repo was updated 7 days ago.
Sorry u-boot-dm/testing. However I have pushed it to u-boot-dm/master now.
If you are sending new patches, can you please base on that?
Sure, I will take a look.
Regards, Bin
On Wed, Nov 07, 2018 at 03:50:34AM -0800, Bin Meng wrote:
This reverts commit c0434407b595f785fc7401237896c48c791b45fd.
It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot.
Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit.
This commit should be reverted after v2018.11 release.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Acked-by: Peng Fan peng.fan@nxp.com Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
participants (4)
-
Bin Meng -
Peng Fan -
Simon Glass -
Tom Rini