[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-326-g6383521
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-326-g6383521
|
From: jorasse <jo...@us...> - 2013-07-23 16:57:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 63835213cd853f6ba0ca56d708a648d2dae6fb06 (commit)
from 217ecfabace13b5719c8f166818ba0e77a765180 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 63835213cd853f6ba0ca56d708a648d2dae6fb06
Author: Eric Jarrige <eri...@ar...>
Date: Tue Jul 23 19:08:00 2013 +0200
[UBOOT] apf51: add U-Boot 2013.04 configuration file - first draft
-----------------------------------------------------------------------
Summary of changes:
...f51-u-boot-2012.10.h => apf51-u-boot-2013.04.h} | 128 ++++++++++++-------
1 files changed, 81 insertions(+), 47 deletions(-)
copy buildroot/target/device/armadeus/apf51/{apf51-u-boot-2012.10.h => apf51-u-boot-2013.04.h} (89%)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
similarity index 89%
copy from buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
copy to buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
index 63024df..f641431 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
@@ -2,7 +2,7 @@
*
* Configuration settings for the Armadeus Project motherboard APF51
*
- * Copyright (C) 2010-2012 ej / Armadeus Project <eri...@ar...>
+ * Copyright (C) 2010-2013 ej / Armadeus Project <eri...@ar...>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -25,8 +25,8 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "1.3"
-#define CONFIG_IDENT_STRING " apf51 patch 1.8"
-#define CONFIG_BOARD_NAME apf51
+#define CONFIG_IDENT_STRING " apf51 patch 2.0"
+#define CONFIG_BOARD_NAME apf51
/*
* SoC configurations
@@ -46,23 +46,35 @@
/*
* Board display option
*/
-/*#define CONFIG_DISPLAY_BOARDINFO*/
-/*#define CONFIG_DISPLAY_CPUINFO*/
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_DISPLAY_CPUINFO
/*
* SPL
*/
-#ifndef CONFIG_DOWNLOAD_BY_DEBUGGER
-#define CONFIG_FLASH_HEADER
-#define CONFIG_FLASH_HEADER_OFFSET 0x400
-#define CONFIG_FLASH_HEADER_BARKER 0xB1
-#endif
-
+#define CONFIG_SPL
+#define CONFIG_SPL_MAX_SIZE 0x4000 /* can be extended to 128kiB */
+/* CONFIG_SPL_TEXT_BASE -> IRAM start address available for SPL :
+ * - 0x1FFE0000 IRAM base address
+ * - 0x00002000 IRAM space reserved for IPL
+ * - 0x00000800 size of SPL DCD header
+ */
+#define CONFIG_SPL_TEXT_BASE 0x1FFE2800
+#define CONFIG_SPL_STACK CONFIG_SYS_INIT_RAM_ADDR \
+ + CONFIG_SYS_INIT_RAM_SIZE \
+ - 0x80000 /* MMU and IPL stack */
+#define CONFIG_SPL_LIBCOMMON_SUPPORT
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_SERIAL_SUPPORT
+#define CONFIG_SPL_GPIO_SUPPORT
+
+/* NAND boot config */
+#define CONFIG_SPL_NAND_SUPPORT
#define CONFIG_NAND_U_BOOT
-/* APF Copy SPL+U-Boot here */
-#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_LOAD_ADDR
-/* APF Size is the partion size */
+#define CONFIG_SYS_NAND_U_BOOT_OFFS CONFIG_SYS_MONITOR_OFFSET
#define CONFIG_SYS_NAND_U_BOOT_SIZE CONFIG_SYS_MONITOR_LEN
+#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_LOAD_ADDR
+#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
/*
* BOOTP options
@@ -72,40 +84,38 @@
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
-/*
#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
-*/
#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
-#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
+#define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
/*
* U-Boot Commands
*/
#include <config_cmd_default.h>
-#undef CONFIG_CMD_LOADS
#define CONFIG_CMD_ASKENV /* ask for env variable */
-/*#define CONFIG_CMD_BSP*/ /* Board Specific functions */
+#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
+/*#define CONFIG_CMD_DATE*/
#define CONFIG_CMD_DHCP /* DHCP Support */
-/*#define CONFIG_CMD_DNS*/
-/*#define CONFIG_CMD_EXT2*/
+#define CONFIG_CMD_DNS
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT /* FAT support */
/*#define CONFIG_CMD_I2C*/ /* I2C serial bus support */
-/*#define CONFIG_CMD_IIM*/ /* imx iim fuse */
+/*#define CONFIG_CMD_IIM*/ /* imx iim fuse */
+#define CONFIG_CMD_MII /* MII support */
/*#define CONFIG_CMD_MMC*/
#define CONFIG_CMD_MTDPARTS /* MTD partition support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK
#define CONFIG_CMD_NAND_TRIMFFS
-#undef CONFIG_CMD_NFS
+#define CONFIG_CMD_NFS /* NFS support */
#define CONFIG_CMD_PING /* ping support */
-/*#define CONFIG_CMD_SETEXPR*/ /* setexpr support */
-/*#define CONFIG_CMD_UBI*/
-/*#define CONFIG_CMD_UBIFS*/
-
-#undef CONFIG_CMD_XIMG /* Load part of Multi Image */
+#define CONFIG_CMD_SETEXPR /* setexpr support */
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_UBIFS
/*
* Memory configurations
@@ -128,7 +138,7 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_SYS_TEXT_BASE 0x97000000
+#define CONFIG_SYS_TEXT_BASE 0x90004000
/*
* FLASH organization
@@ -183,14 +193,14 @@
#define CONFIG_SETUP_MEMORY_TAGS /* send memory definition to kernel */
#define CONFIG_INITRD_TAG /* send initrd params */
-/* #define CONFIG_REVISION_TAG */
+#define CONFIG_REVISION_TAG
#define CONFIG_OF_LIBFDT
#define CONFIG_BOOTDELAY 5
#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_BOOTFILE MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS "console=" MK_STR(ACFG_CONSOLE_DEV) "," \
- MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+#define CONFIG_BOOTFILE __stringify(CONFIG_BOARD_NAME) "-linux.bin"
+#define CONFIG_BOOTARGS "console=" __stringify(ACFG_CONSOLE_DEV) "," \
+ __stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
#define ACFG_CONSOLE_DEV ttymxc2
@@ -207,15 +217,15 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
- "consoledev=" MK_STR(ACFG_CONSOLE_DEV) "\0" \
+ "consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nand0,7\0" \
- "uboot_addr=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0" \
- "env_addr=" MK_STR(CONFIG_ENV_OFFSET) "\0" \
- "firmware_addr=" MK_STR(CONFIG_FIRMWARE_OFFSET) "\0" \
- "kernel_addr=" MK_STR(CONFIG_KERNEL_OFFSET) "\0" \
- "rootfs_addr=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
- "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
+ "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_OFFSET) "\0" \
+ "env_addr=" __stringify(CONFIG_ENV_OFFSET) "\0" \
+ "firmware_addr=" __stringify(CONFIG_FIRMWARE_OFFSET) "\0" \
+ "kernel_addr=" __stringify(CONFIG_KERNEL_OFFSET) "\0" \
+ "rootfs_addr=" __stringify(CONFIG_ROOTFS_OFFSET) "\0" \
+ "board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
"kernel_addr_r=90800000\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
@@ -307,36 +317,51 @@
/*
* NAND
*/
-#define CONFIG_NAND_MXC_V2
-#define CONFIG_MXC_NAND_REGS_BASE 0xCFFF0000
+#define CONFIG_NAND_MXC
+
+#define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI
+#define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR
#define CONFIG_SYS_NAND_BASE CONFIG_MXC_NAND_REGS_BASE
+#define CONFIG_SYS_NAND_SIZE (256 * 1024 * 1024)
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_MXC_NAND_HWECC
#define CONFIG_SYS_NAND_LARGEPAGE
+#define CONFIG_SYS_NAND_USE_FLASH_BBT
#define NAND_MAX_CHIPS 1
+#define CONFIG_SYS_NAND_5_ADDR_CYCLE
+#define CONFIG_SYS_NAND_PAGE_COUNT 64
+#define CONFIG_SYS_NAND_PAGE_SIZE 2048
+#define CONFIG_SYS_NAND_OOBSIZE 64
+#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024)
+#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS
+#define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\
+ 10, 11, 12, 13}
+#define CONFIG_SYS_NAND_ECCSIZE 512
+#define CONFIG_SYS_NAND_ECCBYTES 3
+
#define CONFIG_SYS_DIRECT_FLASH_TFTP
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_NAND_QUIET 1
+
+
/*
* Partitions & Filsystems
*/
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-/*
#define CONFIG_DOS_PARTITION
#define CONFIG_SUPPORT_VFAT
-*/
+
/*
* UBIFS
*/
-/*
#define CONFIG_RBTREE
#define CONFIG_LZO
-*/
+
/*
* Ethernet (on SOC mx51 FEC)
@@ -424,7 +449,7 @@
* Watchdog Config
*/
#define CONFIG_HW_WATCHDOG
-
+#define CONFIG_IMX_WATCHDOG
/*
* USB
*/
@@ -481,6 +506,15 @@
#define DP_MFD_800 (65536 - 1)
#define DP_MFN_800 60354
+/* 455MHz only needed to define references to compile U-Boot */
+#define DP_OP_455 ((9 << 4) + ((2 - 1) << 0))
+#define DP_MFD_455 (48 - 1)
+#define DP_MFN_455 23
+
+#define DP_OP_400 ((11 << 4) + ((3 - 1) << 0))
+#define DP_MFD_400 (65536 - 1)
+#define DP_MFN_400 60354
+
#define ACFG_PLL2_CLK 665 /* MHz */
#define DP_OP_665 ((14 << 4) + ((3 - 1) << 0))
#define DP_MFD_665 (2097152 - 1)
hooks/post-receive
--
armadeus
|
