diff options
| author | Vincent Stehlé <vincent.stehle@intel.com> | 2016-06-06 18:20:57 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-06-06 21:39:06 +0200 |
| commit | 7bdbee2311ed4ad7737b63116c36950384f25be2 (patch) | |
| tree | cf34d88d47606cc9dc258fb0f7dd1c14cd17566d /board/minnowboard | |
| parent | caf515e25e699eb306d0b24986734790de80af28 (diff) | |
configs/minnowboard_max: bump kernel to 4.6.1
Also, rebase kernel config and adapt kernel command line in grub config file
to follow mmc numbering change.
[Peter: drop now unused linux-4.4.config]
Signed-off-by: Vincent Stehlé <vincent.stehle@intel.com>
Cc: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'board/minnowboard')
| -rw-r--r-- | board/minnowboard/grub-minnowboard-max.cfg | 2 | ||||
| -rw-r--r-- | board/minnowboard/linux-4.6.config (renamed from board/minnowboard/linux-4.4.config) | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/board/minnowboard/grub-minnowboard-max.cfg b/board/minnowboard/grub-minnowboard-max.cfg index f38db8f62..3d6feb702 100644 --- a/board/minnowboard/grub-minnowboard-max.cfg +++ b/board/minnowboard/grub-minnowboard-max.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /bzImage root=/dev/mmcblk0p2 rootwait console=tty0 console=ttyS0,115200 + linux /bzImage root=/dev/mmcblk2p2 rootwait console=tty0 console=ttyS0,115200 } diff --git a/board/minnowboard/linux-4.4.config b/board/minnowboard/linux-4.6.config index 349842325..3bc1ffdf0 100644 --- a/board/minnowboard/linux-4.4.config +++ b/board/minnowboard/linux-4.6.config @@ -28,8 +28,8 @@ CONFIG_I2C_I801=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_DESIGNWARE_PCI=y CONFIG_SPI=y -CONFIG_SPI_PXA2XX=y CONFIG_SPI_DESIGNWARE=y +CONFIG_SPI_PXA2XX=y CONFIG_PINCTRL_BAYTRAIL=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y @@ -52,5 +52,4 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PCI=y CONFIG_MMC_SDHCI_ACPI=y CONFIG_PWM=y -CONFIG_PWM_LPSS=y CONFIG_EXT4_FS=y |