Skip to contentSkip to conversation

Marzen and Bockw defconfig updates

PATCH New Simon Horman 2 participants 13 messages Oct 10, 2013 – Oct 16, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Marzen and Bockw defconfig updates

Hi,

this series of defconfig updates aims to bring the bockw and marzen defconfigs more into line with the other shmobile defconfigs. It also allows the marzen and bockw boards to boot into a Debian armhf userspace, again in line with the defconfigs for other shmobile boards.

Simon Horman (11):
ARM: shmobile: bockw: Do not set command line in defconfig
ARM: shmobile: marzen: Do not set command line in defconfig
ARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfig
ARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfig
ARM: shmobile: bockw: Enable CONFIG_VFP in defconfig
ARM: shmobile: marzen: Enable CONFIG_VFP in defconfig
ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig
ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig
ARM: shmobile: bockw: Enable CONFIG_PACKET in defconfig
ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig
ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig

 arch/arm/configs/bockw_defconfig  | 7 ++-----
 arch/arm/configs/marzen_defconfig | 8 ++------
 2 files changed, 4 insertions(+), 11 deletions(-)
Signature · 1 line
1.8.4
#1 lore raw

PATCH 1/11 ARM: shmobile: bockw: Do not set command line in defconfig

As a set towards moving shmobile towards multi-platform the kernel command line should be set in the DTB rather than in the kernel config.

bockw already has the command line present in its DTS file but it was being overrirden by the kernel config.

A side effect of this change is that "rw" is now present on the command line which allows a boot using nfs root to succeed in the case where userspace expects to be able to write to the root filesystem.

---
 arch/arm/configs/bockw_defconfig | 2 --
 1 file changed, 2 deletions(-)
arch/arm/configs/bockw_defconfig +0 -2
index e7e9494..6c5421c 100644
@@ -27,8 +27,6 @@ CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
-CONFIG_CMDLINE="console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp"
-CONFIG_CMDLINE_FORCE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_SUSPEND is not set
 CONFIG_PM_RUNTIME=y
Signature · 1 line
1.8.4
#2 lore raw

PATCH 2/11 ARM: shmobile: marzen: Do not set command line in defconfig

In reply to Simon Horman

As a set towards moving shmobile towards multi-platform the kernel command line should be set in the DTB rather than in the kernel config.

marzen already has the command line present in its DTS file but it was being overrirden by the kernel config.

---
 arch/arm/configs/marzen_defconfig | 2 --
 1 file changed, 2 deletions(-)
arch/arm/configs/marzen_defconfig +0 -2
index 000e920..96391fc 100644
@@ -30,8 +30,6 @@ CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
-CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on"
-CONFIG_CMDLINE_FORCE=y
 CONFIG_KEXEC=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_PM_RUNTIME=y
Signature · 1 line
1.8.4
#3 lore raw

PATCH 3/11 ARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfig

In reply to Simon Horman

CONFIG_INOTIFY_USER is required for udev to function. This change brings the bockw defconfig into line with other shmobile defconfigs.

---
 arch/arm/configs/bockw_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/bockw_defconfig +0 -1
index 6c5421c..88bcb04 100644
@@ -106,7 +106,6 @@ CONFIG_UIO=y
 CONFIG_UIO_PDRV_GENIRQ=y
 # CONFIG_IOMMU_SUPPORT is not set
 # CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
 CONFIG_TMPFS=y
 # CONFIG_MISC_FILESYSTEMS is not set
 CONFIG_NFS_FS=y
Signature · 1 line
1.8.4
#4 lore raw

PATCH 4/11 ARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfig

In reply to Simon Horman

CONFIG_INOTIFY_USER is required for udev to function. This change brings the marzen defconfig into line with other shmobile defconfigs.

---
 arch/arm/configs/marzen_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/marzen_defconfig +0 -1
index 96391fc..5d0fa5f 100644
@@ -106,7 +106,6 @@ CONFIG_UIO=y
 CONFIG_UIO_PDRV_GENIRQ=y
 # CONFIG_IOMMU_SUPPORT is not set
 # CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
 CONFIG_TMPFS=y
 # CONFIG_MISC_FILESYSTEMS is not set
 CONFIG_NFS_FS=y
Signature · 1 line
1.8.4
#5 lore raw

PATCH 5/11 ARM: shmobile: bockw: Enable CONFIG_VFP in defconfig

In reply to Simon Horman

CONFIG_VFP is required to boot into a Debian armhf user-space. This change brings the bockw defconfig into line with other shmobile defconfigs.

---
 arch/arm/configs/bockw_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/bockw_defconfig +1 -0
index 88bcb04..db7d792 100644
@@ -27,6 +27,7 @@ CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
+CONFIG_VFP=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_SUSPEND is not set
 CONFIG_PM_RUNTIME=y
Signature · 1 line
1.8.4
#6 lore raw

PATCH 6/11 ARM: shmobile: marzen: Enable CONFIG_VFP in defconfig

In reply to Simon Horman

CONFIG_VFP is required to boot into a Debian armhf user-space. This change brings the marzen defconfig into line with other shmobile defconfigs.

---
 arch/arm/configs/marzen_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/marzen_defconfig +1 -0
index 5d0fa5f..cafab6a 100644
@@ -30,6 +30,7 @@ CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
+CONFIG_VFP=y
 CONFIG_KEXEC=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_PM_RUNTIME=y
Signature · 1 line
1.8.4
#7 lore raw

PATCH 7/11 ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig

In reply to Simon Horman

This change brings the bockw defconfig into line with other shmobile defconfigs.

---
 arch/arm/configs/bockw_defconfig | 2 --
 1 file changed, 2 deletions(-)
arch/arm/configs/bockw_defconfig +0 -2
index db7d792..03fef6d 100644
@@ -43,8 +43,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
Signature · 1 line
1.8.4
#8 lore raw

PATCH 8/11 ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig

In reply to Simon Horman

This change brings the marzen defconfig into line with other shmobile defconfigs.

---
 arch/arm/configs/marzen_defconfig | 2 --
 1 file changed, 2 deletions(-)
arch/arm/configs/marzen_defconfig +0 -2
index cafab6a..292728d 100644
@@ -42,8 +42,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
Signature · 1 line
1.8.4
#9 lore raw

PATCH 9/11 ARM: shmobile: bockw: Enable CONFIG_PACKET in defconfig

In reply to Simon Horman

CONFIG_PACKET is required for the ISC dhcpd daemon function. This change brings the bockw defconfig into line with other shmobile defconfigs.

---
 arch/arm/configs/bockw_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/bockw_defconfig +1 -0
index 03fef6d..225cb8e 100644
@@ -32,6 +32,7 @@ CONFIG_VFP=y
 # CONFIG_SUSPEND is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_NET=y
+CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
Signature · 1 line
1.8.4
#10 lore raw

PATCH 10/11 ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig

In reply to Simon Horman

CONFIG_PACKET is required for the ISC dhcpd daemon function. This change brings the marzen defconfig into line with other shmobile defconfigs.

---
 arch/arm/configs/marzen_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/marzen_defconfig +1 -0
index 292728d..7f3aa36 100644
@@ -35,6 +35,7 @@ CONFIG_KEXEC=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_NET=y
+CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
Signature · 1 line
1.8.4
#11 lore raw

PATCH 11/11 ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig

In reply to Simon Horman

CONFIG_SMC911X is not needed by marzen.
It appears to have been accidently enabled as well as CONFIG_SMSC911X which is needed by marzen.

---
 arch/arm/configs/marzen_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/marzen_defconfig +0 -1
index 7f3aa36..d821344 100644
@@ -59,7 +59,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_SMC911X=y
 CONFIG_SMSC911X=y
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_WLAN is not set
Signature · 1 line
1.8.4
#12 lore raw

cover Marzen and Bockw defconfig updates

In reply to Simon Horman
Quoted 21 lines · Simon Horman

Hi,

this series of defconfig updates aims to bring the bockw and marzen defconfigs more into line with the other shmobile defconfigs. It also allows the marzen and bockw boards to boot into a Debian armhf userspace, again in line with the defconfigs for other shmobile boards.

Simon Horman (11):
ARM: shmobile: bockw: Do not set command line in defconfig
ARM: shmobile: marzen: Do not set command line in defconfig
ARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfig
ARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfig
ARM: shmobile: bockw: Enable CONFIG_VFP in defconfig
ARM: shmobile: marzen: Enable CONFIG_VFP in defconfig
ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig
ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig
ARM: shmobile: bockw: Enable CONFIG_PACKET in defconfig
ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig
ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig

Quoted 3 lines
 arch/arm/configs/bockw_defconfig  | 7 ++-----
 arch/arm/configs/marzen_defconfig | 8 ++------
 2 files changed, 4 insertions(+), 11 deletions(-)

I have queued up these patches.