Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
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.
---
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
common/board_f.c +0 -28
@@ -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: " );
include/init.h +0 -7
@@ -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 );
Signature · 1 line
2.7.4
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.
---
configs/imx8qxp_mek_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/imx8qxp_mek_defconfig +1 -0
@@ -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
Signature · 1 line
2.7.4
PATCH 2/2 imx8qxp_mek: Disable CONFIG_DISPLAY_CPUINFO
Quoted 10 lines
-----Original Message-----
From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: 2018年11月7日 19:51
To: Tom Rini <[email protected]>; Simon Glass <[email protected]>; U-Boot Mailing List <[email protected]>
Cc: Mario Six <[email protected]>; Peng Fan <[email protected]>
Subject: [PATCH 2/2]imx8qxp_mek: DisableCONFIG_DISPLAY_CPUINFO
Quoted 6 lines
Due to revert of commit
c0434407b595, this board does not build any more. DisableCONFIG_DISPLAY_CPUINFOfor v2018.11 release.This commit should be reverted after v2018.11 release.
Signed-off-by Bin Meng <[email protected]>
Quoted 19 lines
---
configs/imx8qxp_mek_defconfig | 1 + 1 file changed, 1 insertion(+)configs/imx8qxp_mek_defconfig +0
-0@@ -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_CPUINFOis not set
CONFIG_CMD_CPU=y
#CONFIG_CMD_IMPORTENVis not set
CONFIG_CMD_CLK=y
--
2.7.4
PATCH 2/2 imx8qxp_mek: Disable CONFIG_DISPLAY_CPUINFO
In reply to Bin MengQuoted 11 lines · Bin Meng
Due to revert of commit
c0434407b595, this board does not build any more. DisableCONFIG_DISPLAY_CPUINFOfor v2018.11 release.This commit should be reverted after v2018.11 release.
Signed-off-by Bin Meng <[email protected]>---
configs/imx8qxp_mek_defconfig | 1 + 1 file changed, 1 insertion(+)
PATCH 2/2 imx8qxp_mek: Disable CONFIG_DISPLAY_CPUINFO
In reply to Bin MengQuoted 8 lines · Bin Meng
Due to revert of commit
c0434407b595, this board does not build any more. DisableCONFIG_DISPLAY_CPUINFOfor v2018.11 release.This commit should be reverted after v2018.11 release.
Signed-off-by Bin Meng <[email protected]>Acked-by Peng Fan <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181107/495a1329/attachment.sig>
PATCH 1/2 Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
In reply to Bin MengQuoted 16 lines
-----Original Message-----
From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: 2018年11月7日 19:51
To: Tom Rini <[email protected]>; Simon Glass <[email protected]>; U-Boot Mailing List <[email protected]>
Cc: Mario Six <[email protected]>; Peng Fan <[email protected]>
Subject: [PATCH 1/2] Revert "board_f: Use staticprint_cpuinfoifCONFIG_CPUis active"This reverts commit
c0434407b595f785fc7401237896c48c791b45fd.It turns out commit
c0434407b595broke some boards which have DM CPU driver withCONFIG_DISPLAY_CPUINFOoption on. These boards just fail to boot whenprint_cpuinfo()is called during boot.
Quoted 6 lines
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 <[email protected]>
Quoted 69 lines
---
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)common/board_f.c index 213d044..afafec5 renamed from common/board_f.c +0
-0100644
common/board_f.c +0
-26@@ -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: " );include/init.h +0
-8@@ -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
PATCH 1/2 Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
In reply to Bin MengQuoted 11 lines · Bin Meng
This reverts commit
c0434407b595f785fc7401237896c48c791b45fd.It turns out commit
c0434407b595broke some boards which have DM CPU driver withCONFIG_DISPLAY_CPUINFOoption on. These boards just fail to boot whenprint_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.
Quoted 8 lines
This commit should be reverted after v2018.11 release.
Signed-off-by Bin Meng <[email protected]>---
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?
PATCH 1/2 Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
Hi Simon,
Quoted 18 lines · Simon Glass
Quoted 16 lines · Bin Meng
This reverts commit
c0434407b595f785fc7401237896c48c791b45fd.It turns out commit
c0434407b595broke some boards which have DM CPU driver withCONFIG_DISPLAY_CPUINFOoption on. These boards just fail to boot whenprint_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 <[email protected]>---
Quoted 8 lines
Quoted 3 lines
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.
Quoted 1 line
Reviewed-by Simon Glass <[email protected]>
Regards,
Bin
PATCH 1/2 Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
Hi Bin,
Quoted 26 lines · Bin Meng
Hi Simon,
Quoted 22 lines · Simon Glass
Quoted 19 lines · Bin Meng
This reverts commit
c0434407b595f785fc7401237896c48c791b45fd.It turns out commit
c0434407b595broke some boards which have DM CPU driver withCONFIG_DISPLAY_CPUINFOoption on. These boards just fail to boot whenprint_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 <[email protected]>---
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
Quoted 6 lines
Quoted 4 lines
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
PATCH 1/2 Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
Hi Simon,
Quoted 30 lines · Simon Glass
Hi Bin,
Quoted 26 lines · Bin Meng
Hi Simon,
Quoted 22 lines · Simon Glass
Quoted 19 lines · Bin Meng
This reverts commit
c0434407b595f785fc7401237896c48c791b45fd.It turns out commit
c0434407b595broke some boards which have DM CPU driver withCONFIG_DISPLAY_CPUINFOoption on. These boards just fail to boot whenprint_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 <[email protected]>---
common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-)
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines
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
PATCH 1/2 Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
Hi Bin,
Quoted 39 lines · Bin Meng
Hi Simon,
Quoted 35 lines · Simon Glass
Hi Bin,
Quoted 31 lines · Bin Meng
Hi Simon,
Quoted 26 lines · Simon Glass
Quoted 11 lines · Bin Meng
This reverts commit
c0434407b595f785fc7401237896c48c791b45fd.It turns out commit
c0434407b595broke some boards which have DM CPU driver withCONFIG_DISPLAY_CPUINFOoption on. These boards just fail to boot whenprint_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.
Quoted 8 lines
This commit should be reverted after v2018.11 release.
Signed-off-by Bin Meng <[email protected]>---
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?
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
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
PATCH 1/2 Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
Hi Simon,
Quoted 45 lines · Simon Glass
Hi Bin,
Quoted 41 lines · Bin Meng
Hi Simon,
Quoted 37 lines · Simon Glass
Hi Bin,
Quoted 32 lines · Bin Meng
Hi Simon,
Quoted 18 lines · Simon Glass
Quoted 16 lines · Bin Meng
This reverts commit
c0434407b595f785fc7401237896c48c791b45fd.It turns out commit
c0434407b595broke some boards which have DM CPU driver withCONFIG_DISPLAY_CPUINFOoption on. These boards just fail to boot whenprint_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 <[email protected]>---
Quoted 8 lines
Quoted 3 lines
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.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
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
PATCH 1/2 Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
In reply to Bin MengQuoted 10 lines · Bin Meng
This reverts commit
c0434407b595f785fc7401237896c48c791b45fd.It turns out commit
c0434407b595broke some boards which have DM CPU driver withCONFIG_DISPLAY_CPUINFOoption on. These boards just fail to boot whenprint_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.
Quoted 5 lines
This commit should be reverted after v2018.11 release.
Signed-off-by Bin Meng <[email protected]>Acked-by Peng Fan <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181107/a4ec2610/attachment.sig>