diff mbox

[U-Boot,5/5] arm64: mvebu: a8k: Add NAND configuration parameters

Message ID 1490714218-24012-6-git-send-email-kostap@marvell.com
State Superseded
Delegated to: Stefan Roese
Headers show

Commit Message

Kostya Porotchkin March 28, 2017, 3:16 p.m. UTC
From: Konstantin Porotchkin <kostap@marvell.com>

Add NAND configuration parameters to A8K shared config file.
Add defconfig for db-88f7040 board with boot from NAND setup.

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Igal Liberman <igall@marvell.com>
Cc: Nadav Haklai <nadavh@marvell.com>
---
 configs/mvebu_db-88f7040-nand_defconfig | 72 +++++++++++++++++++++++++++++++++
 include/configs/mvebu_armada-8k.h       | 11 +++++
 2 files changed, 83 insertions(+)
 create mode 100644 configs/mvebu_db-88f7040-nand_defconfig

Comments

Stefan Roese April 19, 2017, 8:44 a.m. UTC | #1
Hi Kosta,

On 28.03.2017 17:16, kostap@marvell.com wrote:
> From: Konstantin Porotchkin <kostap@marvell.com>
> 
> Add NAND configuration parameters to A8K shared config file.
> Add defconfig for db-88f7040 board with boot from NAND setup.
> 
> Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
> Cc: Stefan Roese <sr@denx.de>
> Cc: Igal Liberman <igall@marvell.com>
> Cc: Nadav Haklai <nadavh@marvell.com>
> ---
>  configs/mvebu_db-88f7040-nand_defconfig | 72 +++++++++++++++++++++++++++++++++
>  include/configs/mvebu_armada-8k.h       | 11 +++++
>  2 files changed, 83 insertions(+)
>  create mode 100644 configs/mvebu_db-88f7040-nand_defconfig

I'm currently testing this patchset and get this compilation error
via Travis:

   aarch64:  +   mvebu_db-88f7040-nand
+drivers/mtd/nand/pxa3xx_nand.c: In function alloc_nand_resource:
+drivers/mtd/nand/pxa3xx_nand.c:1513:36: error: MVEBU_NAND_BASE undeclared (first use in this function)
+  info->mmio_base = (void __iomem *)MVEBU_NAND_BASE;

Did I miss a patch that adds this macro for A7/8k?

Thanks,
Stefan
Kostya Porotchkin April 19, 2017, 8:50 a.m. UTC | #2
Hi, Stefan,

> -----Original Message-----
> From: Stefan Roese [mailto:sr@denx.de]
> Sent: Wednesday, April 19, 2017 11:45
> To: Kostya Porotchkin; u-boot@lists.denx.de
> Cc: Igal Liberman; Nadav Haklai
> Subject: [EXT] Re: [PATCH 5/5] arm64: mvebu: a8k: Add NAND configuration
> parameters
> 
> External Email
> 
> ----------------------------------------------------------------------
> Hi Kosta,
> 
> On 28.03.2017 17:16, kostap@marvell.com wrote:
> > From: Konstantin Porotchkin <kostap@marvell.com>
> >
> > Add NAND configuration parameters to A8K shared config file.
> > Add defconfig for db-88f7040 board with boot from NAND setup.
> >
> > Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
> > Cc: Stefan Roese <sr@denx.de>
> > Cc: Igal Liberman <igall@marvell.com>
> > Cc: Nadav Haklai <nadavh@marvell.com>
> > ---
> >  configs/mvebu_db-88f7040-nand_defconfig | 72
> +++++++++++++++++++++++++++++++++
> >  include/configs/mvebu_armada-8k.h       | 11 +++++
> >  2 files changed, 83 insertions(+)
> >  create mode 100644 configs/mvebu_db-88f7040-nand_defconfig
> 
> I'm currently testing this patchset and get this compilation error via
> Travis:
> 
>    aarch64:  +   mvebu_db-88f7040-nand
> +drivers/mtd/nand/pxa3xx_nand.c: In function alloc_nand_resource:
> +drivers/mtd/nand/pxa3xx_nand.c:1513:36: error: MVEBU_NAND_BASE
> +undeclared (first use in this function)
> +  info->mmio_base = (void __iomem *)MVEBU_NAND_BASE;
> 
> Did I miss a patch that adds this macro for A7/8k?
[Konstantin Porotchkin] 
The hardcoded values should be changed in the following patch:
[PATCH 1/5] fix: nand: pxa3xx: Remove hardcode values from the driver
However I do not see it on patchworks site.
Should I re-send it?

Thanks
Kosta
> 
> Thanks,
> Stefan
Stefan Roese April 19, 2017, 8:55 a.m. UTC | #3
Hi Kosta,

On 19.04.2017 10:50, Kostya Porotchkin wrote:
> Hi, Stefan,
>
>> -----Original Message-----
>> From: Stefan Roese [mailto:sr@denx.de]
>> Sent: Wednesday, April 19, 2017 11:45
>> To: Kostya Porotchkin; u-boot@lists.denx.de
>> Cc: Igal Liberman; Nadav Haklai
>> Subject: [EXT] Re: [PATCH 5/5] arm64: mvebu: a8k: Add NAND configuration
>> parameters
>>
>> External Email
>>
>> ----------------------------------------------------------------------
>> Hi Kosta,
>>
>> On 28.03.2017 17:16, kostap@marvell.com wrote:
>>> From: Konstantin Porotchkin <kostap@marvell.com>
>>>
>>> Add NAND configuration parameters to A8K shared config file.
>>> Add defconfig for db-88f7040 board with boot from NAND setup.
>>>
>>> Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
>>> Cc: Stefan Roese <sr@denx.de>
>>> Cc: Igal Liberman <igall@marvell.com>
>>> Cc: Nadav Haklai <nadavh@marvell.com>
>>> ---
>>>  configs/mvebu_db-88f7040-nand_defconfig | 72
>> +++++++++++++++++++++++++++++++++
>>>  include/configs/mvebu_armada-8k.h       | 11 +++++
>>>  2 files changed, 83 insertions(+)
>>>  create mode 100644 configs/mvebu_db-88f7040-nand_defconfig
>>
>> I'm currently testing this patchset and get this compilation error via
>> Travis:
>>
>>    aarch64:  +   mvebu_db-88f7040-nand
>> +drivers/mtd/nand/pxa3xx_nand.c: In function alloc_nand_resource:
>> +drivers/mtd/nand/pxa3xx_nand.c:1513:36: error: MVEBU_NAND_BASE
>> +undeclared (first use in this function)
>> +  info->mmio_base = (void __iomem *)MVEBU_NAND_BASE;
>>
>> Did I miss a patch that adds this macro for A7/8k?
> [Konstantin Porotchkin]
> The hardcoded values should be changed in the following patch:
> [PATCH 1/5] fix: nand: pxa3xx: Remove hardcode values from the driver
> However I do not see it on patchworks site.
> Should I re-send it?

No need. I've found it in my inbox. Travis build is already restarted...

Thanks,
Stefan
diff mbox

Patch

diff --git a/configs/mvebu_db-88f7040-nand_defconfig b/configs/mvebu_db-88f7040-nand_defconfig
new file mode 100644
index 0000000..d86c18e
--- /dev/null
+++ b/configs/mvebu_db-88f7040-nand_defconfig
@@ -0,0 +1,72 @@ 
+CONFIG_ARM=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_TARGET_MVEBU_ARMADA_8K=y
+CONFIG_DEFAULT_DEVICE_TREE="armada-7040-db-nand"
+CONFIG_SMBIOS_PRODUCT_NAME=""
+CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_BOARD_LATE_INIT=y
+# CONFIG_DISPLAY_CPUINFO is not set
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_ARCH_EARLY_INIT_R=y
+CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HUSH_PARSER=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PART=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_NAND=y
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_MVEBU_BUBT=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_BLOCK_CACHE=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MVTWSI=y
+CONFIG_MISC=y
+CONFIG_DM_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_XENON=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_MVEBU_NAND_BOOT=y
+CONFIG_NAND_PXA3XX=y
+CONFIG_PHYLIB=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_PCIE_DW_MVEBU=y
+CONFIG_MVEBU_COMPHY_SUPPORT=y
+CONFIG_PINCTRL=y
+# CONFIG_SPL_SERIAL_PRESENT is not set
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_BASE=0xf0512000
+CONFIG_DEBUG_UART_CLOCK=200000000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_SMBIOS_MANUFACTURER=""
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index a8a9d15..839abd9 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -76,11 +76,22 @@ 
 #define CONFIG_ENV_SPI_MODE		CONFIG_SF_DEFAULT_MODE
 
 /* Environment in SPI NOR flash */
+#ifdef CONFIG_MVEBU_SPI_BOOT
 #define CONFIG_ENV_IS_IN_SPI_FLASH
+/* Environment in NAND flash */
+#elif defined(CONFIG_MVEBU_NAND_BOOT)
+#define CONFIG_ENV_IS_IN_NAND
+#endif
+
 #define CONFIG_ENV_OFFSET		0x180000 /* as Marvell U-Boot version */
 #define CONFIG_ENV_SIZE			(64 << 10) /* 64KiB */
 #define CONFIG_ENV_SECT_SIZE		(64 << 10) /* 64KiB sectors */
 
+#define CONFIG_SYS_MAX_NAND_DEVICE	1
+#define CONFIG_SYS_NAND_MAX_CHIPS	1
+#define CONFIG_SYS_NAND_ONFI_DETECTION
+#define CONFIG_SYS_NAND_USE_FLASH_BBT
+
 /* USB 2.0 */
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3