| Message ID | 1358099647-22323-1-git-send-email-olof@lixom.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jan 13, 2013 at 09:54:07AM -0800, Olof Johansson wrote: > This refreshes the dove_defconfig, and adds: > PRINTK_TIME > DEVTMPFS > EXT4 > > They're quite useful, and allows booting a cubox ubuntu rootfs on SD card, > since that by default uses ext4. > > The rest of the churn is due to options and defaults moving around, no > functional difference. > > Signed-off-by: Olof Johansson <olof@lixom.net> > Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > > --- > arch/arm/configs/dove_defconfig | 28 ++++++++-------------------- > 1 file changed, 8 insertions(+), 20 deletions(-) Applied to mvebu/boards thx, Jason.
On Wednesday 23 January 2013, Jason Cooper wrote: > On Sun, Jan 13, 2013 at 09:54:07AM -0800, Olof Johansson wrote: > > This refreshes the dove_defconfig, and adds: > > PRINTK_TIME > > DEVTMPFS > > EXT4 > > > > They're quite useful, and allows booting a cubox ubuntu rootfs on SD card, > > since that by default uses ext4. > > > > The rest of the churn is due to options and defaults moving around, no > > functional difference. > > > > Signed-off-by: Olof Johansson <olof@lixom.net> > > Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > > > > --- > > arch/arm/configs/dove_defconfig | 28 ++++++++-------------------- > > 1 file changed, 8 insertions(+), 20 deletions(-) > > Applied to mvebu/boards Hi Olof, I've just tried rebuilding the for-next branch, which turned out very easy this time, but this one patch is what stuck out: apparently you had already applied it into for-next, but it is not on any of the other branches. Do you know what is going on here? Arnd
On Tue, Feb 19, 2013 at 04:15:40PM +0000, Arnd Bergmann wrote: > On Wednesday 23 January 2013, Jason Cooper wrote: > > On Sun, Jan 13, 2013 at 09:54:07AM -0800, Olof Johansson wrote: > > > This refreshes the dove_defconfig, and adds: > > > PRINTK_TIME > > > DEVTMPFS > > > EXT4 > > > > > > They're quite useful, and allows booting a cubox ubuntu rootfs on SD card, > > > since that by default uses ext4. > > > > > > The rest of the churn is due to options and defaults moving around, no > > > functional difference. > > > > > > Signed-off-by: Olof Johansson <olof@lixom.net> > > > Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > > > > > > --- > > > arch/arm/configs/dove_defconfig | 28 ++++++++-------------------- > > > 1 file changed, 8 insertions(+), 20 deletions(-) > > > > Applied to mvebu/boards > > Hi Olof, > > I've just tried rebuilding the for-next branch, which turned out very > easy this time, but this one patch is what stuck out: apparently > you had already applied it into for-next, but it is not on > any of the other branches. Do you know what is going on here? crap, should I not have pulled it? thx, Jason.
On Tuesday 19 February 2013, Jason Cooper wrote: > > > > I've just tried rebuilding the for-next branch, which turned out very > > easy this time, but this one patch is what stuck out: apparently > > you had already applied it into for-next, but it is not on > > any of the other branches. Do you know what is going on here? > > crap, should I not have pulled it? I don't think you did anything wrong with this, I just don't know why it's in for-next. Was this part of your pull requests from last friday? Arnd
On Tue, Feb 19, 2013 at 9:12 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Tuesday 19 February 2013, Jason Cooper wrote: >> > >> > I've just tried rebuilding the for-next branch, which turned out very >> > easy this time, but this one patch is what stuck out: apparently >> > you had already applied it into for-next, but it is not on >> > any of the other branches. Do you know what is going on here? >> >> crap, should I not have pulled it? > > I don't think you did anything wrong with this, I just don't know > why it's in for-next. You did nothing wrong, Jason. This was my mess-up, I was working on top of for-next instead of for-next~0, which I usually do when doing small local changes, and it accidentally got included in a push. > Was this part of your pull requests from last friday? I believe they were, yes. But I haven't looked much at those yet. -Olof
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index 0b7ee92..3fe8dae 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig @@ -1,26 +1,24 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_EXPERT=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_DOVE=y CONFIG_MACH_DOVE_DB=y CONFIG_MACH_CM_A510=y CONFIG_MACH_DOVE_DT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y CONFIG_AEABI=y +CONFIG_HIGHMEM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_HIGHMEM=y -CONFIG_USE_OF=y -CONFIG_ATAGS=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y CONFIG_VFP=y CONFIG_NET=y CONFIG_PACKET=y @@ -32,8 +30,9 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y -CONFIG_MTD_PARTITIONS=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y @@ -57,7 +56,6 @@ CONFIG_ATA=y CONFIG_SATA_MV=y CONFIG_NETDEVICES=y CONFIG_MV643XX_ETH=y -# CONFIG_NETDEV_10000 is not set CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y @@ -68,10 +66,7 @@ CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_DEVKMEM is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_SERIAL_8250_PCI is not set CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y @@ -81,13 +76,11 @@ CONFIG_SPI=y CONFIG_SPI_ORION=y # CONFIG_HWMON is not set CONFIG_USB=y -CONFIG_USB_DEVICEFS=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_IO_ACCESSORS=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_DOVE=y CONFIG_NEW_LEDS=y @@ -104,6 +97,7 @@ CONFIG_MV_XOR=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_UDF_FS=m @@ -112,24 +106,20 @@ CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_850=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_2=y CONFIG_NLS_UTF8=y +CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y # CONFIG_SCHED_DEBUG is not set CONFIG_TIMER_STATS=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_DEBUG_INFO=y -CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_PCBC=m @@ -138,7 +128,6 @@ CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_BLOWFISH=y CONFIG_CRYPTO_TEA=y CONFIG_CRYPTO_TWOFISH=y @@ -147,5 +136,4 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_MV_CESA=y CONFIG_CRC_CCITT=y -CONFIG_CRC16=y CONFIG_LIBCRC32C=y
This refreshes the dove_defconfig, and adds: PRINTK_TIME DEVTMPFS EXT4 They're quite useful, and allows booting a cubox ubuntu rootfs on SD card, since that by default uses ext4. The rest of the churn is due to options and defaults moving around, no functional difference. Signed-off-by: Olof Johansson <olof@lixom.net> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- arch/arm/configs/dove_defconfig | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)