[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-278-gd289c43
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-278-gd289c43
|
From: jorasse <jo...@us...> - 2012-04-19 23:35:35
|
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 d289c434f204eb6a1c49ecb31df6e5610483b9fc (commit)
from 35902a27e059d1edd7372115b4aa261b30875d35 (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 d289c434f204eb6a1c49ecb31df6e5610483b9fc
Author: Eric Jarrige <eri...@ar...>
Date: Fri Apr 20 01:46:48 2012 +0200
[UBOOT][APF9328] remove predefined var filesize/fileaddr - fix typo
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf9328/apf9328-u-boot-2011.12.h | 28 +++++++++----------
patches/u-boot/2011.12/103-apf9328.patch | 8 +++---
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
index e6f7343..2f1f0b8 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
@@ -23,8 +23,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "5.0"
-#define CONFIG_IDENT_STRING " apf9328 patch 5.0"
+#define CONFIG_ENV_VERSION "5.1"
+#define CONFIG_IDENT_STRING " apf9328 patch 5.1"
#define CONFIG_BOARD_NAME apf9328
/*
@@ -112,14 +112,14 @@
*/
#define CONFIG_SYS_MONITOR_BASE 0x10000000
#define CONFIG_SYS_MONITOR_LEN 0x00040000 /* 256kB ( 2 flash sector ) */
-#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_ADDR 0x10040000 /* absolute address for now */
#define CONFIG_ENV_SIZE 0x00020000
#define CONFIG_ENV_SECT_SIZE 0x00020000
#define CONFIG_ENV_ADDR_REDUND \
(CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) /* +128kB */
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 128kB */
-#define CONFIG_ENV_OVERWRITE 1 /* env is writable now */
#define CONFIG_FIRMWARE_ADDR 0x10080000
#define CONFIG_FIRMWARE_LEN 0x00040000 /* 256kB ( 2 flash sector ) */
#define CONFIG_KERNEL_ADDR 0x100C0000
@@ -186,8 +186,6 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
- "fileaddr=" MK_STR(CONFIG_SYS_LOAD_ADDR) "\0" \
- "filesize=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
"consoledev=" MK_STR(ACFG_CONSOLE_DEV) "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nor0,5\0" \
@@ -272,12 +270,12 @@
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max 32MB of FLASH memory */
#define CONFIG_SYS_FLASH_BASE 0x10000000 /* location of flash memory*/
-#define CONFIG_SYS_FLASH_CFI 1
-#define CONFIG_FLASH_CFI_DRIVER 1
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_FLASH_CFI_MTD
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1
-#define CONFIG_SYS_FLASH_PROTECTION 1
-#define CONFIG_SYS_DIRECT_FLASH_TFTP 1
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
+#define CONFIG_SYS_FLASH_PROTECTION
+#define CONFIG_SYS_DIRECT_FLASH_TFTP
#define CONFIG_FLASH_SHOW_PROGRESS 45
/*
* This is setting for JFFS2 support in u-boot.
@@ -291,11 +289,11 @@
/* DM9000 ethernet chipset assigned to CS4 */
/* For the apf board DM9000 base is 0x15C00000 and data is base+2 */
/* For the apm board DM9000 base is 0x15C3FFFC and data is base+4 */
-#define CONFIG_DRIVER_DM9000 1
+#define CONFIG_DRIVER_DM9000
#define CONFIG_DM9000_BASE 0x15C00000
#define DM9000_IO CONFIG_DM9000_BASE
#define DM9000_DATA (CONFIG_DM9000_BASE+2)
-#define CONFIG_NETCONSOLE 1
+#define CONFIG_NETCONSOLE
/*
* FPGA
@@ -320,13 +318,13 @@
/*
* I2C bus
*/
-#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
+#define CONFIG_HARD_I2C /* I2C with hardware support */
#define CONFIG_SYS_I2C_SPEED 400000 /* 400 kHz */
#define CONFIG_SYS_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC256 */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 /* bytes of address */
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 /* bytes of address */
/* mask of address bits that overflow into the "EEPROM chip address" */
/*#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x00*/
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6
diff --git a/patches/u-boot/2011.12/103-apf9328.patch b/patches/u-boot/2011.12/103-apf9328.patch
index 752743b..37cd173 100644
--- a/patches/u-boot/2011.12/103-apf9328.patch
+++ b/patches/u-boot/2011.12/103-apf9328.patch
@@ -149,11 +149,11 @@ Index: u-boot-custom/board/armadeus/apf9328/apf9328.c
+{
+ char *s;
+
-+#if (CONFIG_FPGA)
++#ifdef CONFIG_FPGA
+ apf9328_init_fpga();
+#endif
+
-+#if (CONFIG_DRIVER_DM9000)
++#ifdef CONFIG_DRIVER_DM9000
+ imx_gpio_mode(GPIO_PORTB | GPIO_DR | GPIO_IN | 14);
+#endif
+
@@ -234,7 +234,7 @@ Index: u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
+#include <asm/io.h>
+#include "apf9328fpga.h"
+
-+#if (CONFIG_FPGA)
++#ifdef CONFIG_FPGA
+DECLARE_GLOBAL_DATA_PTR;
+/* Note that these are pointers to code that is in Flash. They will be
+ * relocated at runtime.
@@ -451,7 +451,7 @@ Index: u-boot-custom/board/armadeus/apf9328/fpga.c
+ */
+#include <common.h>
+
-+#if (CONFIG_FPGA)
++#ifdef CONFIG_FPGA
+
+#include <asm/arch/imx-regs.h>
+#include <asm/io.h>
hooks/post-receive
--
armadeus
|
