diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2017-08-12 23:08:28 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-08-12 23:08:53 +0100 |
| commit | 66d8e083d56cda2369f98554cd81e56cac2a46b5 (patch) | |
| tree | d6414caf38267d973fb1b8b7a2afe9bc5e976d15 | |
| parent | 0134b5c8b96ecebce9e97a24dd6cec33cb087dd6 (diff) | |
| parent | d7f8738db2f9a1dfb7490492d59d6f907803cff8 (diff) | |
| download | kernel_replicant_linux-66d8e083d56cda2369f98554cd81e56cac2a46b5.tar.gz kernel_replicant_linux-66d8e083d56cda2369f98554cd81e56cac2a46b5.tar.bz2 kernel_replicant_linux-66d8e083d56cda2369f98554cd81e56cac2a46b5.zip | |
Merge remote-tracking branch 'alioth/rosh/strip_armel'
Note Roger's changes in changelog.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/config/armel/config.marvell | 12 | ||||
| -rw-r--r-- | debian/installer/armel/modules/armel-marvell/mtd-modules | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 73832c5ebffd..01aa0c5ffc09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,9 @@ linux (4.12.6-1) UNRELEASED; urgency=medium * [arm64] enable MMC_SDHCI_XENON and MVNETA for Espressobin and enable respective device in its device tree (Closes: #871049) + [ Roger Shimizu ] + * [armel] Change NAND related stuff to modules (fixes FTBFS) + -- Ben Hutchings <ben@decadent.org.uk> Tue, 18 Jul 2017 13:26:41 +0100 linux (4.12.2-1~exp1) experimental; urgency=medium diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell index 186ce11b5b75..0c30597601c5 100644 --- a/debian/config/armel/config.marvell +++ b/debian/config/armel/config.marvell @@ -363,8 +363,8 @@ CONFIG_NFTL=m ## ## file: drivers/mtd/chips/Kconfig ## -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m CONFIG_MTD_CFI_ADV_OPTIONS=y ## choice: Flash cmd/query data swapping CONFIG_MTD_CFI_NOSWAP=y @@ -384,9 +384,9 @@ CONFIG_MTD_CFI_I4=y # CONFIG_MTD_CFI_I8 is not set # CONFIG_MTD_OTP is not set #. Needed e.g. on QNAP devices -CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_INTELEXT=m #. Needed e.g. on D-Link DNS-323, Buffalo KuroBox-Pro, Buffalo Linkstation LS-GL / LS-WTGL, etc -CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_AMDSTD=m CONFIG_MTD_CFI_STAA=m # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set @@ -413,10 +413,10 @@ CONFIG_MTD_PHYSMAP_OF=y ## ## file: drivers/mtd/nand/Kconfig ## -CONFIG_MTD_NAND=y +CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_CAFE is not set -CONFIG_MTD_NAND_ORION=y +CONFIG_MTD_NAND_ORION=m ## ## file: drivers/mtd/onenand/Kconfig diff --git a/debian/installer/armel/modules/armel-marvell/mtd-modules b/debian/installer/armel/modules/armel-marvell/mtd-modules index 5fcac1e0a647..a26280d329d7 100644 --- a/debian/installer/armel/modules/armel-marvell/mtd-modules +++ b/debian/installer/armel/modules/armel-marvell/mtd-modules @@ -1,2 +1,7 @@ #include <mtd-modules> m25p80 +cfi_probe +gen_probe +jedec_probe +nand +orion_nand |