| Message ID | 20150421102307.GA4252@amd |
|---|---|
| State | Rejected |
| Delegated to: | Marek Vasut |
| Headers | show |
On Tue 2015-04-21 12:23:07, Pavel Machek wrote: > Setting configuration options in header file leads to incosistency > between .config user sees, and .config he has. What is worse, a lot of > compile warnings is presented for any such config option user sets in > .config. > > Signed-off-by: Pavel Machek <pavel@denx.de> Ping? Please apply. > --- > v2: > > > You need to add these to common/Kconfig > > as well as to your defconfig. > > > > Otherwise, they do not appear in the .config file. > > > > There exist CMD_RUN, CMD_PING, CMD_USB in common/Kconfig, > > but most of the others are missing. > > Ok, I did conversion only for those present in Kconfig. > > diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig > index 0ebfbfc..5cfc56c 100644 > --- a/configs/socfpga_cyclone5_defconfig > +++ b/configs/socfpga_cyclone5_defconfig > @@ -6,3 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk" > CONFIG_DM=y > CONFIG_DM_SPI=y > CONFIG_DM_SPI_FLASH=y > +CONFIG_CMD_DHCP=y > +CONFIG_CMD_FPGA=y > +CONFIG_CMD_NET=y > +CONFIG_CMD_PING=y > +CONFIG_CMD_USB=y > diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig > index 873b721..0cde0e9 100644 > --- a/configs/socfpga_socrates_defconfig > +++ b/configs/socfpga_socrates_defconfig > @@ -6,3 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" > CONFIG_DM=y > CONFIG_DM_SPI=y > CONFIG_DM_SPI_FLASH=y > +CONFIG_CMD_DHCP=y > +CONFIG_CMD_FPGA=y > +CONFIG_CMD_NET=y > +CONFIG_CMD_PING=y > +CONFIG_CMD_USB=y > diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h > index 2e3a8b6..93a0572 100644 > --- a/include/configs/socfpga_cyclone5.h > +++ b/include/configs/socfpga_cyclone5.h > @@ -22,19 +22,14 @@ > #define CONFIG_CMD_BOOTZ > #define CONFIG_CMD_CACHE > #define CONFIG_CMD_DFU > -#define CONFIG_CMD_DHCP > #define CONFIG_CMD_EXT4 > #define CONFIG_CMD_EXT4_WRITE > #define CONFIG_CMD_FAT > -#define CONFIG_CMD_FPGA > #define CONFIG_CMD_FS_GENERIC > #define CONFIG_CMD_GREPENV > #define CONFIG_CMD_MII > #define CONFIG_CMD_MMC > -#define CONFIG_CMD_NET > -#define CONFIG_CMD_PING > #define CONFIG_CMD_SETEXPR > -#define CONFIG_CMD_USB > #define CONFIG_CMD_USB_MASS_STORAGE > > #define CONFIG_REGEX /* Enable regular expression support */ > >
2015-05-15 17:31 GMT+09:00 Pavel Machek <pavel@denx.de>: > On Tue 2015-04-21 12:23:07, Pavel Machek wrote: >> Setting configuration options in header file leads to incosistency >> between .config user sees, and .config he has. What is worse, a lot of >> compile warnings is presented for any such config option user sets in >> .config. >> >> Signed-off-by: Pavel Machek <pavel@denx.de> > > Ping? Please apply. > This message was sent to me, but I assume it was addressed to Marek because it is only related to SOCFPGA.
On Fri 2015-05-15 17:36:32, Masahiro Yamada wrote: > 2015-05-15 17:31 GMT+09:00 Pavel Machek <pavel@denx.de>: > > On Tue 2015-04-21 12:23:07, Pavel Machek wrote: > >> Setting configuration options in header file leads to incosistency > >> between .config user sees, and .config he has. What is worse, a lot of > >> compile warnings is presented for any such config option user sets in > >> .config. > >> > >> Signed-off-by: Pavel Machek <pavel@denx.de> > > > > Ping? Please apply. > > This message was sent to me, but I assume it was addressed to Marek > because it is only related to SOCFPGA. Yes, I'd like Marek to apply it. And Marek wanted your confirmation it looks reasonable... Thanks, Pavel
Hi. 2015-05-15 17:48 GMT+09:00 Pavel Machek <pavel@denx.de>: > On Fri 2015-05-15 17:36:32, Masahiro Yamada wrote: >> 2015-05-15 17:31 GMT+09:00 Pavel Machek <pavel@denx.de>: >> > On Tue 2015-04-21 12:23:07, Pavel Machek wrote: >> >> Setting configuration options in header file leads to incosistency >> >> between .config user sees, and .config he has. What is worse, a lot of >> >> compile warnings is presented for any such config option user sets in >> >> .config. >> >> >> >> Signed-off-by: Pavel Machek <pavel@denx.de> >> > >> > Ping? Please apply. >> >> This message was sent to me, but I assume it was addressed to Marek >> because it is only related to SOCFPGA. > > Yes, I'd like Marek to apply it. And Marek wanted your confirmation it > looks reasonable... > The defconfig files in u-boot/master have been all cleaned up by commit bd328eb38274ffaf04caaa8a6ecc09b7e19a650e Author: Joe Hershberger <joe.hershberger@ni.com> Date: Tue May 12 14:46:24 2015 -0500 Clean all defconfigs with savedefconfig If this patch is applied onto u-boot-socfpga now and then a pull-req is issued, it will cause a conflict. So, I recommend Marek to sync u-boot-socfpga/master with the mainline, and then v3 should be applied. Please use savedefconfig rather than adding entries to the bottom of the files.
On Friday, May 15, 2015 at 11:00:37 AM, Masahiro Yamada wrote: > Hi. Hi! > 2015-05-15 17:48 GMT+09:00 Pavel Machek <pavel@denx.de>: > > On Fri 2015-05-15 17:36:32, Masahiro Yamada wrote: > >> 2015-05-15 17:31 GMT+09:00 Pavel Machek <pavel@denx.de>: > >> > On Tue 2015-04-21 12:23:07, Pavel Machek wrote: > >> >> Setting configuration options in header file leads to incosistency > >> >> between .config user sees, and .config he has. What is worse, a lot > >> >> of compile warnings is presented for any such config option user > >> >> sets in .config. > >> >> > >> >> Signed-off-by: Pavel Machek <pavel@denx.de> > >> > > >> > Ping? Please apply. > >> > >> This message was sent to me, but I assume it was addressed to Marek > >> because it is only related to SOCFPGA. > > > > Yes, I'd like Marek to apply it. And Marek wanted your confirmation it > > looks reasonable... > > The defconfig files in u-boot/master have been all cleaned up by > > commit bd328eb38274ffaf04caaa8a6ecc09b7e19a650e > Author: Joe Hershberger <joe.hershberger@ni.com> > Date: Tue May 12 14:46:24 2015 -0500 > > Clean all defconfigs with savedefconfig > > > > > If this patch is applied onto u-boot-socfpga now and then a pull-req is > issued, it will cause a conflict. > > So, I recommend Marek to sync u-boot-socfpga/master with the mainline, > and then v3 should be applied. Yes Sir, synched! > Please use savedefconfig rather than adding entries to the bottom of the > files. Best regards, Marek Vasut
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 0ebfbfc..5cfc56c 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -6,3 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk" CONFIG_DM=y CONFIG_DM_SPI=y CONFIG_DM_SPI_FLASH=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_FPGA=y +CONFIG_CMD_NET=y +CONFIG_CMD_PING=y +CONFIG_CMD_USB=y diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 873b721..0cde0e9 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -6,3 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" CONFIG_DM=y CONFIG_DM_SPI=y CONFIG_DM_SPI_FLASH=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_FPGA=y +CONFIG_CMD_NET=y +CONFIG_CMD_PING=y +CONFIG_CMD_USB=y diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h index 2e3a8b6..93a0572 100644 --- a/include/configs/socfpga_cyclone5.h +++ b/include/configs/socfpga_cyclone5.h @@ -22,19 +22,14 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_CACHE #define CONFIG_CMD_DFU -#define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT4 #define CONFIG_CMD_EXT4_WRITE #define CONFIG_CMD_FAT -#define CONFIG_CMD_FPGA #define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MII #define CONFIG_CMD_MMC -#define CONFIG_CMD_NET -#define CONFIG_CMD_PING #define CONFIG_CMD_SETEXPR -#define CONFIG_CMD_USB #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_REGEX /* Enable regular expression support */