Add qcom_defconfig and update msm_defconfig
cover Add qcom_defconfig and update msm_defconfig
Now that we have mach-qcom, introduce a qcom_defconfig to match and update the msm_defconfig to compile a board in mach-msm.
Stephen Boyd (3):
ARM: config: Add qcom_defconfig
ARM: msm: Silence readb/writeb warnings due to missing IOMEM()
ARM: config: Update msm_defconfig
arch/arm/configs/msm_defconfig | 25 +++-------------------
arch/arm/configs/{msm_defconfig => qcom_defconfig} | 4 +---
arch/arm/mach-msm/board-trout-gpio.c | 2 +-
arch/arm/mach-msm/board-trout.c | 2 +-
arch/arm/mach-msm/board-trout.h | 2 +-
5 files changed, 7 insertions(+), 28 deletions(-)
copy arch/arm/configs/{msm_defconfig => qcom_defconfig} (97%)Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 1/3 ARM: config: Add qcom_defconfig
Add a defconfig for mach-qcom platforms. Although these platforms are part of the multi-platform kernel, it's useful to have a stripped down version of the defconfig that just selects the Qualcomm based platforms and drivers.
--- arch/arm/configs/qcom_defconfig | 139 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 arch/arm/configs/qcom_defconfig
arch/arm/configs/qcom_defconfig new file +139 -0
@@ -0,0 +1,139 @@ +CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS_ALL=y +CONFIG_EMBEDDED=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_PROFILING=y +CONFIG_OPROFILE=y +CONFIG_KPROBES=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_ARCH_QCOM=y +CONFIG_ARCH_MSM8X60=y +CONFIG_ARCH_MSM8960=y +CONFIG_ARCH_MSM8974=y +CONFIG_SMP=y +CONFIG_PREEMPT=y +CONFIG_AEABI=y +CONFIG_HIGHMEM=y +CONFIG_HIGHPTE=y +CONFIG_CLEANCACHE=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_VFP=y +CONFIG_NEON=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_IPV6 is not set +CONFIG_CFG80211=y +CONFIG_RFKILL=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_SCSI=y +CONFIG_SCSI_TGT=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=y +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +CONFIG_SLIP=y +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_MODE_SLIP6=y +CONFIG_USB_USBNET=y +# CONFIG_USB_NET_AX8817X is not set +# CONFIG_USB_NET_ZAURUS is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_MOUSE_PS2 is not set +CONFIG_INPUT_JOYSTICK=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_MSM=y +CONFIG_SERIAL_MSM_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_MSM=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_SPI=y +CONFIG_DEBUG_GPIO=y +CONFIG_GPIO_SYSFS=y +CONFIG_POWER_SUPPLY=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_MSM=y +CONFIG_THERMAL=y +CONFIG_REGULATOR=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_FB=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_DYNAMIC_MINORS=y +# CONFIG_SND_ARM is not set +# CONFIG_SND_SPI is not set +# CONFIG_SND_USB is not set +CONFIG_SND_SOC=y +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_MON=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_MSM=y +CONFIG_USB_ACM=y +CONFIG_USB_SERIAL=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DEBUG_FILES=y +CONFIG_USB_GADGET_VBUS_DRAW=500 +CONFIG_RTC_CLASS=y +CONFIG_STAGING=y +CONFIG_COMMON_CLK_QCOM=y +CONFIG_MSM_GCC_8660=y +CONFIG_MSM_MMCC_8960=y +CONFIG_MSM_MMCC_8974=y +CONFIG_MSM_IOMMU=y +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_CIFS=y +CONFIG_PRINTK_TIME=y +CONFIG_DYNAMIC_DEBUG=y +CONFIG_DEBUG_INFO=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_LOCKUP_DETECTOR=y +# CONFIG_DETECT_HUNG_TASK is not set +# CONFIG_SCHED_DEBUG is not set +CONFIG_TIMER_STATS=y
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/3 ARM: msm: Silence readb/writeb warnings due to missing IOMEM()
In reply to Stephen BoydTROUT_CPLD_BASE needs the IOMEM() treatment to avoid warnings from the read/writeb functions.
--- arch/arm/mach-msm/board-trout-gpio.c | 2 +- arch/arm/mach-msm/board-trout.c | 2 +- arch/arm/mach-msm/board-trout.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-msm/board-trout-gpio.c +1 -1
@@ -89,7 +89,7 @@ static int trout_gpio_to_irq(struct gpio_chip *chip, unsigned offset) .base = base_gpio, \ .ngpio = 8, \ }, \ - .reg = (void *) reg_num + TROUT_CPLD_BASE, \ + .reg = reg_num + TROUT_CPLD_BASE, \ .shadow = shadow_val, \ }
arch/arm/mach-msm/board-trout.c +1 -1
@@ -78,7 +78,7 @@ static void __init trout_init(void)static struct map_desc trout_io_desc[]__initdata = { { - .virtual =TROUT_CPLD_BASE , + .virtual = (unsigned long )TROUT_CPLD_BASE , .pfn =__phys_to_pfn (TROUT_CPLD_START ), .length =TROUT_CPLD_SIZE , .type =MT_DEVICE_NONSHARED
arch/arm/mach-msm/board-trout.h +1 -1
@@ -58,7 +58,7 @@#define TROUT_4_TP_LS_EN 19#define TROUT_5_TP_LS_EN 1 -#define TROUT_CPLD_BASE 0xE8100000 +#define TROUT_CPLD_BASE IOMEM(0xE8100000)#define TROUT_CPLD_START 0x98000000#define TROUT_CPLD_SIZE SZ_4K
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 3/3 ARM: config: Update msm_defconfig
In reply to Stephen BoydNow that DT based platforms are split out of mach-msm into mach-qcom, put back a non-DT based SoC into the msm_defconfig and stop selecting unsupported drivers.
--- arch/arm/configs/msm_defconfig | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-)
arch/arm/configs/msm_defconfig +3 -22
@@ -17,21 +17,14 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_PARTITION_ADVANCED=y -CONFIG_ARCH_MSM_DT=y -CONFIG_ARCH_MSM8X60=y -CONFIG_ARCH_MSM8960=y -CONFIG_ARCH_MSM8974=y -CONFIG_SMP=y +CONFIG_ARCH_MSM=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y CONFIG_HIGHPTE=y CONFIG_CLEANCACHE=y -CONFIG_CC_STACKPROTECTOR=y -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_AUTO_ZRELADDR=y CONFIG_VFP=y -CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_NET=y CONFIG_PACKET=y
@@ -79,16 +72,12 @@ CONFIG_SERIO_LIBPS2=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MSM=y +# CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_SPI=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_MSM=y CONFIG_THERMAL=y CONFIG_REGULATOR=y CONFIG_MEDIA_SUPPORT=y
@@ -100,25 +89,17 @@ CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_SPI is not set # CONFIG_SND_USB is not set CONFIG_SND_SOC=y -CONFIG_HID_BATTERY_STRENGTH=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_MSM=y CONFIG_USB_ACM=y CONFIG_USB_SERIAL=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG_FILES=y CONFIG_USB_GADGET_VBUS_DRAW=500 -CONFIG_NEW_LEDS=y CONFIG_RTC_CLASS=y CONFIG_STAGING=y -CONFIG_COMMON_CLK_QCOM=y -CONFIG_MSM_GCC_8660=y -CONFIG_MSM_MMCC_8960=y -CONFIG_MSM_MMCC_8974=y -CONFIG_MSM_IOMMU=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT3_FS=y
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 1/3] ARM: config: Add qcom_defconfig
In reply to Stephen BoydQuoted 4 lines · Stephen Boyd
Add a defconfig for mach-qcom platforms. Although these platforms are part of the multi-platform kernel, it's useful to have a stripped down version of the defconfig that just selects the Qualcomm based platforms and drivers.
How minimal are we aiming here? It might be nice to at least get DEVTMPFS/DEVTMPFS_MOUNT=y in here, as I think udev barfs without it.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 1/3] ARM: config: Add qcom_defconfig
Quoted 8 lines · Josh Cartwright
Quoted 4 lines · Stephen Boyd
Add a defconfig for mach-qcom platforms. Although these platforms are part of the multi-platform kernel, it's useful to have a stripped down version of the defconfig that just selects the Qualcomm based platforms and drivers.
How minimal are we aiming here? It might be nice to at least get DEVTMPFS/DEVTMPFS_MOUNT=y in here, as I think udev barfs without it.
Sure that's fine as others are doing the same. I'll send a v1.1.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 1/1 ARM: config: Add qcom_defconfig
Add a defconfig for mach-qcom platforms (copied from msm_defconfig). Although these platforms are part of the multi-platform kernel, it's useful to have a stripped down version of the defconfig that just selects the DT based Qualcomm platforms and drivers.
---
Changes since v1:
* Added CONFIG_DEVTMPFS/DEVTMPFS_MOUNT per Josh
arch/arm/configs/{msm_defconfig => qcom_defconfig} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
copy arch/arm/configs/{msm_defconfig => qcom_defconfig} (97%)arch/arm/configs/qcom_defconfig renamed from arch/arm/configs/msm_defconfig +3 -3
@@ -17,7 +17,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_PARTITION_ADVANCED=y -CONFIG_ARCH_MSM_DT=y +CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8974=y
@@ -27,7 +27,6 @@ CONFIG_AEABI=y CONFIG_HIGHMEM=y CONFIG_HIGHPTE=y CONFIG_CLEANCACHE=y -CONFIG_CC_STACKPROTECTOR=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_VFP=y
@@ -49,6 +48,8 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_IPV6 is not set CONFIG_CFG80211=y CONFIG_RFKILL=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y
@@ -111,7 +112,6 @@ CONFIG_USB_SERIAL=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG_FILES=y CONFIG_USB_GADGET_VBUS_DRAW=500 -CONFIG_NEW_LEDS=y CONFIG_RTC_CLASS=y CONFIG_STAGING=y CONFIG_COMMON_CLK_QCOM=y
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 3/3] ARM: config: Update msm_defconfig
In reply to Stephen BoydQuoted 8 lines · Stephen Boyd
Now that DT based platforms are split out of mach-msm into mach-qcom, put back a non-DT based SoC into the
msm_defconfigand stop selecting unsupported drivers.Signed-off-by Stephen Boyd <[email protected]>---
arch/arm/configs/msm_defconfig| 25 +++----------------------1 file changed, 3 insertions(+), 22 deletions(-)
Kumar, can you just pull this in with the other qcom changes from Sephen?
Thanks,
David
Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 3/3] ARM: config: Update msm_defconfig
Quoted 10 lines · David Brown
Quoted 8 lines · Stephen Boyd
Now that DT based platforms are split out of mach-msm into mach-qcom, put back a non-DT based SoC into the
msm_defconfigand stop selecting unsupported drivers.Signed-off-by Stephen Boyd <[email protected]>---
arch/arm/configs/msm_defconfig| 25 +++----------------------1 file changed, 3 insertions(+), 22 deletions(-)
Quoted 4 lines
Acked-by David Brown <[email protected]>Kumar, can you just pull this in with the other qcom changes from Sephen?
sure
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH 3/3] ARM: config: Update msm_defconfig
Quoted 13 lines · Kumar Gala
Quoted 10 lines · David Brown
Quoted 8 lines · Stephen Boyd
Now that DT based platforms are split out of mach-msm into mach-qcom, put back a non-DT based SoC into the
msm_defconfigand stop selecting unsupported drivers.Signed-off-by Stephen Boyd <[email protected]>---
arch/arm/configs/msm_defconfig| 25 +++----------------------1 file changed, 3 insertions(+), 22 deletions(-)
Quoted 6 lines
Quoted 4 lines
Acked-by David Brown <[email protected]>Kumar, can you just pull this in with the other qcom changes from Sephen?
sure
I didn't see 2/3 land in our tree through branches from you. Should I just apply it directly by now?
-Olof
Re: [PATCH 3/3] ARM: config: Update msm_defconfig
Quoted 19 lines · Olof Johansson
Quoted 18 lines · Kumar Gala
Quoted 14 lines · David Brown
Quoted 8 lines · Stephen Boyd
Now that DT based platforms are split out of mach-msm into mach-qcom, put back a non-DT based SoC into the
msm_defconfigand stop selecting unsupported drivers.Signed-off-by Stephen Boyd <[email protected]>---
arch/arm/configs/msm_defconfig| 25 +++----------------------1 file changed, 3 insertions(+), 22 deletions(-)Acked-by David Brown <[email protected]>Kumar, can you just pull this in with the other qcom changes from Sephen?
Quoted 7 lines
Quoted 1 line
sure
I didn't see 2/3 land in our tree through branches from you. Should I just apply it directly by now?
-Olof
please do.
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Olof Johansson
AppliedRe: [PATCH 2/3] ARM: msm: Silence readb/writeb warnings due to missing IOMEM()
In reply to Stephen BoydQuoted 10 lines · Stephen Boyd
TROUT_CPLD_BASEneeds theIOMEM()treatment to avoid warnings from the read/writeb functions.Signed-off-by Stephen Boyd <[email protected]>--- arch/arm/mach-msm/board-trout-gpio.c | 2 +- arch/arm/mach-msm/board-trout.c | 2 +- arch/arm/mach-msm/board-trout.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Applied to next/fixes-non-critical.
-Olof