Skip to contentSkip to conversation

powerpc, mpc5200: update defconfig to fit with 2.6.37-rc4

PATCH NAK Heiko Schocher 2 participants 6 messages Dec 11, 2010 – Dec 13, 2010 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 powerpc, mpc5200: update defconfig to fit with 2.6.37-rc4

---
- based against 2.6.37-rc4
- I did the following steps to generate this patch:

make mpc5200_defconfig
make savedefconfig
cp ./defconfig arch/powerpc/configs/mpc5200_defconfig

 arch/powerpc/configs/mpc5200_defconfig |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
arch/powerpc/configs/mpc5200_defconfig +1 -4
index 7376e27..6f75623 100644
@@ -1,5 +1,6 @@
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -20,7 +21,6 @@ CONFIG_PPC_BESTCOMM=y
 CONFIG_SIMPLE_GPIO=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_SPARSE_IRQ=y
 CONFIG_PM=y
 CONFIG_NET=y
 CONFIG_PACKET=y
@@ -52,7 +52,6 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
-CONFIG_EEPROM_AT24=y
 CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
@@ -114,7 +113,6 @@ CONFIG_RTC_DRV_DS1307=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-CONFIG_INOTIFY=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_PROC_KCORE=y
@@ -132,5 +130,4 @@ CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 2/2 powerpc, mpc5200: update mpc5200_defconfig to fit for charon board.

add to mpc5200_defconfig:

CONFIG_SENSORS_LM80=m
CONFIG_RTC_DRV_DS1374=m

as this is used by the charon board.

---
- based against 2.6.37-rc4

 arch/powerpc/configs/mpc5200_defconfig |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/powerpc/configs/mpc5200_defconfig +2 -0
index 6f75623..70e5d8e 100644
@@ -78,6 +78,7 @@ CONFIG_SPI_GPIO=m
 CONFIG_SPI_MPC52xx=m
 CONFIG_SPI_MPC52xx_PSC=m
 CONFIG_SPI_SPIDEV=m
+CONFIG_SENSORS_LM80=m
 CONFIG_WATCHDOG=y
 CONFIG_DRM=y
 CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -110,6 +111,7 @@ CONFIG_USB_STORAGE=y
 CONFIG_NEW_LEDS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_DS1374=m
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
Signature · 1 line
1.7.2.3
#2 lore raw
In reply to Heiko Schocher
Quoted 1 line · Heiko Schocher

I'd say the two patches can be merged. Dunno what Grant prefers whom you should CC as he is the maintainer.

Quoted 33 lines

---
- based against 2.6.37-rc4
- I did the following steps to generate this patch:

make mpc5200_defconfig
make savedefconfig
cp ./defconfig arch/powerpc/configs/mpc5200_defconfig

 arch/powerpc/configs/mpc5200_defconfig |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
arch/powerpc/configs/mpc5200_defconfig +1 -1
index 7376e27..6f75623 100644
@@ -1,5 +1,6 @@
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -20,7 +21,6 @@ CONFIG_PPC_BESTCOMM=y
 CONFIG_SIMPLE_GPIO=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_SPARSE_IRQ=y
 CONFIG_PM=y
 CONFIG_NET=y
 CONFIG_PACKET=y

arch/powerpc/configs/mpc5200_defconfig CONFIG_PROC_DEVICETREE=y · line 55

Quoted 4 lines
arch/powerpc/configs/mpc5200_defconfig +0 -1
@@ -52,7 +52,6 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
-CONFIG_EEPROM_AT24=y

NACK.

arch/powerpc/configs/mpc5200_defconfig CONFIG_RTC_DRV_DS1307=y · line 117

Quoted 8 lines
arch/powerpc/configs/mpc5200_defconfig +0 -1
 CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
@@ -114,7 +113,6 @@ CONFIG_RTC_DRV_DS1307=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-CONFIG_INOTIFY=y

Are you sure?

Quoted 12 lines
arch/powerpc/configs/mpc5200_defconfig +0 -1
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_PROC_KCORE=y
@@ -132,5 +130,4 @@ CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
Signature · 1 line
1.7.2.3
Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#3 lore raw

Hello Wolfram,

Quoted 5 lines · Wolfram Sang
Quoted 1 line · Heiko Schocher

I'd say the two patches can be merged. Dunno what Grant prefers whom you should CC as he is the maintainer.

I prefer the split in two patches, so we can see, what is added by the charon board, and what by "make mpc5200_defconfig" ...

Quoted 31 lines
Quoted 31 lines

---
- based against 2.6.37-rc4
- I did the following steps to generate this patch:

make mpc5200_defconfig
make savedefconfig
cp ./defconfig arch/powerpc/configs/mpc5200_defconfig

 arch/powerpc/configs/mpc5200_defconfig |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
arch/powerpc/configs/mpc5200_defconfig +1 -1
index 7376e27..6f75623 100644
@@ -1,5 +1,6 @@
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -20,7 +21,6 @@ CONFIG_PPC_BESTCOMM=y
 CONFIG_SIMPLE_GPIO=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_SPARSE_IRQ=y
 CONFIG_PM=y
 CONFIG_NET=y
Quoted 8 lines

arch/powerpc/configs/mpc5200_defconfig CONFIG_PROC_DEVICETREE=y · line 55

Quoted 6 lines
arch/powerpc/configs/mpc5200_defconfig +0 -1
 CONFIG_PACKET=y
@@ -52,7 +52,6 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
-CONFIG_EEPROM_AT24=y

NACK.

... I did just the steps above mentioned, so this is automagically done by "make mpc5200_defconfig" !

Quoted 10 lines

arch/powerpc/configs/mpc5200_defconfig CONFIG_RTC_DRV_DS1307=y · line 117

Quoted 8 lines
arch/powerpc/configs/mpc5200_defconfig +0 -1
 CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
@@ -114,7 +113,6 @@ CONFIG_RTC_DRV_DS1307=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-CONFIG_INOTIFY=y

Are you sure?

See comment above, did just the "make mpc5200_defconfig" step ...

Quoted 11 lines
Quoted 11 lines
arch/powerpc/configs/mpc5200_defconfig +0 -1
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_PROC_KCORE=y
@@ -132,5 +130,4 @@ CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
Signature · 1 line
1.7.2.3

Thanks for the review!

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#4 lore raw

Hi Heiko,

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

-CONFIG_EEPROM_AT24=y

NACK.

... I did just the steps above mentioned, so this is automagically done by "make mpc5200_defconfig" !

Yes, I understood that, but I can't help it: it is still wrong. I need it.

Kind regards,

Wolfram

Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#5 lore raw

Hello Wolfram,

Quoted 9 lines · Wolfram Sang

Hi Heiko,

Quoted 4 lines
Quoted 2 lines
Quoted 1 line

-CONFIG_EEPROM_AT24=y

NACK.

... I did just the steps above mentioned, so this is automagically done by "make mpc5200_defconfig" !

Yes, I understood that, but I can't help it: it is still wrong. I need it.

Ok, than we need to look why "make mpc5200_defconfig" did this ... I try to look at this point.

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany