[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-213-g17e2117
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-213-g17e2117
|
From: jorasse <jo...@us...> - 2014-04-08 14:50:59
|
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 17e21178efce9eaaf8daad54c565f31c398734ce (commit)
from 47596b76c6e7450cf14186df04fd23886497e6a2 (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 17e21178efce9eaaf8daad54c565f31c398734ce
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 8 16:50:43 2014 +0200
[UBOOT] 2014.04: apf28: add default configuration
-----------------------------------------------------------------------
Summary of changes:
...f28-u-boot-2013.04.h => apf28-u-boot-2014.04.h} | 135 +++++---------------
1 files changed, 35 insertions(+), 100 deletions(-)
copy buildroot/target/device/armadeus/apf28/{apf28-u-boot-2013.04.h => apf28-u-boot-2014.04.h} (75%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
similarity index 75%
copy from buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
copy to buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
index 7ec72c5..384840b 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2013 Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2011-2014 Eric Jarrige <eri...@ar...>
*
* SPDX-License-Identifier:Â Â Â Â Â GPL-2.0+
*/
@@ -7,9 +7,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION 11
-#define CONFIG_IDENT_STRING " apf28 patch 1.4"
+#define CONFIG_IDENT_STRING " apf28 patch 1.5"
#define CONFIG_BOARD_NAME apf28
/*
@@ -18,15 +17,10 @@
#define CONFIG_MX28 /* i.MX28 SoC */
#define CONFIG_MACH_TYPE 3845 /* APF28 */
-#include <asm/arch/regs-base.h>
-
/*
* Enable the call to miscellaneous platform dependent initialization.
*/
#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h>*/
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_APBH_DMA
/*
* Board display option
@@ -35,15 +29,8 @@
#define CONFIG_DOS_PARTITION
/*
- * SPL
+ * SPL inherited from <configs/mxs.h>
*/
-#define CONFIG_SPL
-#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs"
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_GPIO_SUPPORT
/* Enable CONFIG_SYS_NO_DCDC_BATT_SOURCE the following if you only have a
* VDD5V source only and no DCDC_BATT source. This includes configurations with
@@ -99,6 +86,8 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_GPIO
+#define CONFIG_CMD_GREPENV
+#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_MTDPARTS
@@ -107,10 +96,13 @@
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_SETEXPR
+#define CONFIG_CMD_SPI
#define CONFIG_CMD_USB
#define CONFIG_CMD_UBI
#define CONFIG_CMD_UBIFS
+#define CONFIG_REGEX /* Enable regular expression support */
+
/*
* Memory configurations
*/
@@ -118,20 +110,21 @@
#define PHYS_SDRAM_1 0x40000000 /* Base address */
#define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MiB RAM */
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */
-#define CONFIG_SYS_MEMTEST_START 0x40000000 /* Memtest start adr */
-#define CONFIG_SYS_MEMTEST_END 0x40400000 /* 4 MB RAM test */
-/* Point initial SP in SRAM so SPL can use it too. */
-
-#define CONFIG_SYS_INIT_RAM_ADDR 0x00002000
-#define CONFIG_SYS_INIT_RAM_SIZE (128 * 1024)
-#define CONFIG_SYS_INIT_SP_OFFSET \
- (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
- (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
#define CONFIG_SYS_TEXT_BASE 0x40000000
+/* Environment */
+#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
+#define CONFIG_ENV_IS_IN_NAND
+
+/* Environment is in NAND */
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 128kB */
+#define CONFIG_ENV_SECT_SIZE (128 * 1024)
+#define CONFIG_ENV_RANGE (512 * 1024)
+#define CONFIG_ENV_OFFSET 0x300000
+#define CONFIG_ENV_OFFSET_REDUND \
+ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */
+#define CONFIG_ENV_OVERWRITE
+
/*
* FLASH organization
*/
@@ -139,14 +132,6 @@
/* last 2 MiB reservered for 2 copies of U-Boot */
#define CONFIG_SYS_MONITOR_OFFSET 0x00100000 /* offset in NAND */
#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 2 x 1MB */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET 0x00300000 /* NAND offset */
-#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
-#define CONFIG_ENV_RANGE 0x00080000 /* 512kB */
-#define CONFIG_ENV_OFFSET_REDUND \
- (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 512kB */
#define CONFIG_KERNEL_OFFSET 0x00500000 /* 8MB */
#define CONFIG_ROOTFS_OFFSET 0x00D00000
@@ -165,30 +150,16 @@
/*
* U-Boot general configurations
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PROMPT "BIOS> "
-#define CONFIG_SYS_CBSIZE 2048 /* Console I/O buffer size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- /* Print buffer size */
-#define CONFIG_SYS_MAXARGS 16 /* Max number of command args */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
- /* Boot argument buffer size */
-#define CONFIG_AUTO_COMPLETE /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING /* Command history etc */
-#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_PREBOOT "run check_flash check_env;"
/*
* Boot Linux
*/
-#define CONFIG_CMDLINE_TAG /* send commandline to Kernel */
-#define CONFIG_SETUP_MEMORY_TAGS /* send memory definition to kernel */
#define CONFIG_INITRD_TAG /* send initrd params */
/* #define CONFIG_REVISION_TAG */
-#define CONFIG_OF_LIBFDT
#define CONFIG_BOOTDELAY 5
#define CONFIG_ZERO_BOOTDELAY_CHECK
@@ -316,18 +287,12 @@
"unlock_regs=echo unlock_reg not needed anymore\0"
/*
- * Serial Driver
+ * Serial Driver inherited from <configs/mxs.h>
*/
-#define CONFIG_PL011_SERIAL
-#define CONFIG_PL011_CLOCK 24000000
-#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE }
-#define CONFIG_CONS_INDEX 0
-#define CONFIG_BAUDRATE 115200 /* Default baud rate */
/*
- * GPIO
+ * GPIO inherited from <configs/mxs.h>
*/
-#define CONFIG_MXS_GPIO
/*
* NOR
@@ -336,12 +301,6 @@
/*
* NAND
*/
-#define CONFIG_NAND_MXS
-#define CONFIG_APBH_DMA
-#define CONFIG_SYS_NAND_BASE 0x60000000
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-
-#define CONFIG_SYS_NAND_5_ADDR_CYCLE
#define NAND_MAX_CHIPS 1
#define CONFIG_SYS_DIRECT_FLASH_TFTP
@@ -366,13 +325,8 @@
* Ethernet (on SOC mx28 FEC)
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
-#define CONFIG_ETHPRIME "FEC0"
#define CONFIG_FEC_MXC
-#define CONFIG_FEC_MXC_MULTI
-#define CONFIG_MII
-#define CONFIG_DISCOVER_PHY
-#define CONFIG_FEC_XCV_TYPE RMII
+#define CONFIG_NET_MULTI
#define CONFIG_MX28_FEC_MAC_IN_OCOTP
#define CONFIG_NETCONSOLE 1
#endif
@@ -382,37 +336,23 @@
* Fuses - OCOTP
*/
/* #define CONFIG_IMX_OCOTP */
-#define IMX_OCOTP_BASE MXS_OCOTP_BASE
/*
- * I2C
+ * I2C inherited from <configs/mxs.h>
*/
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_I2C_MXS
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED 400000
-#endif
/*
* SPI
*/
-#ifdef CONFIG_CMD_SPI
-#define CONFIG_HARD_SPI
-#define CONFIG_MXS_SPI
-#define CONFIG_SPI_HALF_DUPLEX
-#define CONFIG_DEFAULT_SPI_BUS 2
-#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
+#ifdef CONFIG_CMD_SPI
+#define CONFIG_DEFAULT_SPI_BUS 2
+#define CONFIG_DEFAULT_SPI_CS 0
+#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
#endif
/*
- * SD/MMC
+ * SD/MMC inherited from <configs/mxs.h>
*/
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MXS_MMC
-#endif
/*
* RTC
@@ -430,17 +370,12 @@
/*
* USB
*/
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MXS
-#define CONFIG_EHCI_MXS_PORT 1
-#define CONFIG_EHCI_IS_TDI
-#define CONFIG_USB_STORAGE
+#ifdef CONFIG_CMD_USB
+#define CONFIG_EHCI_MXS_PORT1
+#define CONFIG_USB_STORAGE
#endif
-/*
- * Clocks
- */
-#define CONFIG_SYS_HZ 1000 /* Ticks per second */
+/* The rest of the configuration is shared */
+#include <configs/mxs.h>
#endif /* __CONFIG_H */
hooks/post-receive
--
armadeus
|
