armadeus-commitlog Mailing List for armadeus (Page 79)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jorasse <jo...@us...> - 2012-03-27 09:28:06
|
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 b7de470530a894ad8b091188d33eb0722b0166b4 (commit)
via 52bd75fb1bfd77baba4e36d1bce374f0cc09e336 (commit)
via 3c352c67fdf22595d7504b0b83a0826d14b9e138 (commit)
via 0fbc8acdd30173e9ee06a446cb92798557933fe0 (commit)
via b74c496a31bf5714fefd21a68ee938f961a49ede (commit)
from be1abdd92646fc03af296b221b7b32d7214bfc7b (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 b7de470530a894ad8b091188d33eb0722b0166b4
Merge: 52bd75f be1abdd
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 27 11:39:06 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 52bd75fb1bfd77baba4e36d1bce374f0cc09e336
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 27 11:37:15 2012 +0200
[UBOOT] apf9328 does not support board and cpu display infos
commit 3c352c67fdf22595d7504b0b83a0826d14b9e138
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 27 10:13:33 2012 +0200
change to fix config_cmd_default.h dependencies
Signed-off-by: Eric Jarrige <eri...@ar...>
commit 0fbc8acdd30173e9ee06a446cb92798557933fe0
Merge: b74c496 1430e6f
Author: Eric Jarrige <eri...@ar...>
Date: Sat Mar 24 12:06:01 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit b74c496a31bf5714fefd21a68ee938f961a49ede
Author: Eric Jarrige <eri...@ar...>
Date: Sat Mar 24 11:06:36 2012 +0100
[UBOOT] Update config file structure for all APF boards
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 577 +++++++++----------
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 352 ++++++-----
.../device/armadeus/apf51/apf51-u-boot-2011.12.h | 622 +++++++++-----------
.../armadeus/apf9328/apf9328-u-boot-2011.12.h | 416 ++++++-------
4 files changed, 936 insertions(+), 1031 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index 9ac2f98..ce0215c 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -1,8 +1,8 @@
/*
*
- * Configuration settings for the Armadeus Project apf27 board.
+ * Configuration settings for the Armadeus Project motherboard APF27
*
- * Copyright (c) 2008-2010 Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2008-2012 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
@@ -18,123 +18,186 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
- *
- * 2008/08/19 Initial version based on apf9328 configuration file
- * 2008/10/09 Release 1.0 support u-boot 1.3.4
- * 2008/10/25 Release 1.1 added environment version
- * 2008/11/01 Release 1.2 flash size independant
- * 2008/11/09 Release 1.3 keep uboot partition locked & source clean-up
- * 2010/03/31 U-Boot 2010.03 migration. TODO merge mxc_i2c..
*/
#ifndef __CONFIG_H
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "2.1"
-#define CONFIG_IDENT_STRING " apf27 patch 2.8"
-
-#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
-#define CONFIG_MX27 1 /* in a Freescale i.MX27 Chip */
-#define CONFIG_APF27 1 /* on a Armadeus project APF27 board */
-#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
-#define CONFIG_MACH_TYPE 1698
+#define CONFIG_ENV_VERSION "2.2"
+#define CONFIG_IDENT_STRING " apf27 patch 2.9"
+#define CONFIG_BOARD_NAME apf27
/*
- * Enable the call to misc_init_r() for miscellaneous platform
- * dependent initialization.
+ * SoC configurations
*/
+#define CONFIG_ARM926EJS /* this is an ARM926EJS CPU */
+#define CONFIG_MX27 /* in a Freescale i.MX27 Chip */
+#define CONFIG_MACH_TYPE 1698 /* APF27 */
+/*
+ * Enable the call to miscellaneous platform dependent initialization.
+ */
+#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h> */
#define CONFIG_MISC_INIT_R
/*
+ * Board display option
+ */
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_DISPLAY_CPUINFO
+
+/*
+ * SPL
+ */
+#define CONFIG_NAND_U_BOOT
+/* Copy SPL+U-Boot here */
+#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_LOAD_ADDR
+/* Size is the partion size */
+#define CONFIG_SYS_NAND_U_BOOT_SIZE CONFIG_SYS_MONITOR_LEN
+
+/*
* BOOTP options
*/
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
-
-#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
-/*
- * Select serial console configuration
- */
-#define CONFIG_MXC_UART
-#define CONFIG_SYS_MX27_UART1
-#define CONFIG_CONS_INDEX 1 /* use UART0 for console */
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_BAUDRATE 115200
-#define CONFIG_MXC_UART_BASE UART1_BASE
+#define CONFIG_NETMASK 255.255.255.0
+#define CONFIG_IPADDR 192.168.0.10
+#define CONFIG_GATEWAYIP 192.168.0.1
+#define CONFIG_SERVERIP 192.168.0.2
+
+#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
+#define CONFIG_SRV_PATH ""
+#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
/*
- * Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if
- * neccessary in include/cmd_confdefs.h file. (Un)comment for getting
- * functionality or size of u-boot code.
+ * U-Boot Commands
*/
-
#include <config_cmd_default.h>
#define CONFIG_CMD_ASKENV /* ask for env variable */
#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
-#define CONFIG_CMD_CDP /* Cisco Discovery Protocol */
-/*#define CONFIG_CMD_DATE */ /* support for RTC, date/time...*/
+/*#define CONFIG_CMD_DATE */ /* support for RTC, date/time...*/
#define CONFIG_CMD_DHCP /* DHCP Support */
-#define CONFIG_CMD_DIAG /* Diagnostics */
+#define CONFIG_CMD_DNS
/*#define CONFIG_CMD_EEPROM */ /* EEPROM read/write support */
#define CONFIG_CMD_FAT /* FAT support */
-#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
-/*#define CONFIG_CMD_I2C */ /* I2C serial bus support */
+/*#define CONFIG_CMD_I2C */ /* I2C serial bus support */
#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
-#undef CONFIG_CMD_IMLS /* List all found images */
-#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
#define CONFIG_CMD_MII /* MII support */
#define CONFIG_CMD_MTDPARTS /* MTD partition support */
-#define CONFIG_CMD_MMC /* MMC memory mapped support */
+/*#define CONFIG_CMD_MMC*/ /* MMC memory mapped support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK
#define CONFIG_CMD_NAND_TRIMFFS
+#define CONFIG_CMD_NFS /* NFS support */
#define CONFIG_CMD_PING /* ping support */
-#define CONFIG_CMD_SAVES /* save S record dump */
+/*#define CONFIG_CMD_SAVES*/ /* save S record dump */
#define CONFIG_CMD_SETEXPR /* setexpr support */
/*#define CONFIG_CMD_SNTP */ /* SNTP support */
-#define CONFIG_CMD_NFS /* NFS support */
-#define CONFIG_CMD_DNS
#define CONFIG_CMD_UBI
#define CONFIG_CMD_UBIFS
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_DISPLAY_CPUINFO
+/*
+ * Memory configurations
+ */
+#define CONFIG_NR_DRAM_BANKS 1
+
+#define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
+
+#define PHYS_SDRAM_1 0xA0000000
+#define PHYS_SDRAM_2 0xB0000000
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (512<<10) )
+#define CONFIG_SYS_MEMTEST_START 0xA0000000 /* memtest test area */
+#define CONFIG_SYS_MEMTEST_END 0xA0300000 /*64MiB -1MiB*/
+
+#define CONFIG_SYS_GBL_DATA_SIZE 256 /* size in bytes reserved for initial data */
+
+/*#define CONFIG_STACKSIZE (256<<10)*//* stack size */
+
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE \
+ + PHYS_SDRAM_1_SIZE - 0x0100000)
+
+#define CONFIG_SYS_TEXT_BASE 0xA1000000
/*
- * Select some advanced features of the commande line parser
+ * FLASH organization
*/
-#define CONFIG_AUTO_COMPLETE 1 /* Enable auto completion of */
- /* commands using TAB */
-#define CONFIG_SYS_HUSH_PARSER 1 /* enable the "hush" shell */
+#define CONFIG_SYS_MONITOR_BASE 0xAFF00000
+#define CONFIG_SYS_MONITOR_OFFSET 0x00000000
+#define CONFIG_SYS_MONITOR_LEN 0x000A0000 /* 640kB ( 5 flash blocks ) */
+#define CONFIG_ENV_OFFSET 0x000A0000 /* NAND offset address for now*/
+#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
+#define CONFIG_ENV_RANGE 0X00060000 /* 384kB ( 3 flash blocks ) */
+#define CONFIG_FIRMWARE_OFFSET 0x00100000
+#define CONFIG_FIRMWARE_LEN 0x00080000 /* 512kB ( 4 flash blocks ) */
+#define CONFIG_KERNEL_OFFSET 0x00180000
+#define CONFIG_KERNEL_LEN 0x00500000 /* 5.0MB */
+#define CONFIG_ROOTFS_OFFSET 0x00680000
+#define CONFIG_ROOTFS_LEN /* entire flash if not specified ~116MB*/
+
+#define CONFIG_MTDMAP "mxc_nand.0"
+#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
+#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":640k(U-boot)ro," \
+ "384k(U-boot_env),512k(firmware)," \
+ "5M(kernel)," \
+ "-(rootfs)"
+
+/*
+ * U-Boot general configurations
+ */
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
+#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
+#define CONFIG_SYS_PBSIZE \
+ (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
+ /* Print buffer size */
+#define CONFIG_SYS_MAXARGS 16 /* max command args */
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+ /* Boot argument buffer size */
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
-#define CONFIG_CMDLINE_EDITING 1
/*
- * Boot options. Setting delay to -1 stops autostart count down.
+ * 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
-
+#define CONFIG_BOOTFILE MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)
-#define CONFIG_MTDMAP "mxc_nand.0"
-#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":640k(U-boot)ro," \
- "384k(U-boot_env),512k(firmware)," \
- "5M(kernel)," \
- "-(rootfs)"
+#define CONFIG_BOOTCOMMAND "run ubifsboot"
+#define CONFIG_SYS_AUTOLOAD "no"
+/*
+ * Default load address for user programs and kernel
+ */
+#define CONFIG_LOADADDR 0xA0000000
+#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
+#define CONFIG_SYS_TFTP_LOADADDR CONFIG_LOADADDR
+/*
+ * Extra Environments
+ */
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
"fileaddr=" MK_STR(CONFIG_SYS_LOAD_ADDR) "\0" \
@@ -157,7 +220,6 @@
"ntpserverip=217.147.208.1\0" \
"mmcroot=/dev/mmcblk0p1\0" \
"mmcrootfstype=ext2\0" \
- "quiet=1\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
"addubifsargs=setenv bootargs ${bootargs} " \
@@ -215,8 +277,7 @@
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
- "flash_reset_env=nand unlock ${env_offset} ${env_len};" \
- "nand erase ${env_offset} ${env_len};" \
+ "flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-u-boot.bin\0" \
@@ -231,71 +292,166 @@
"flash_rootfs download_uboot flash_uboot\0" \
"unlock_regs=mw 10000008 0; mw 10020008 0\0" \
-#define CONFIG_BOOTCOMMAND "run ubifsboot"
-#define CONFIG_SYS_AUTOLOAD "no"
-#define CFG_DIRECT_FLASH_TFTP
+/*
+ * Serial Driver
+ */
+#define CONFIG_MXC_UART
+#define CONFIG_SYS_MX27_UART1
+#define CONFIG_CONS_INDEX 1
+#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
+#define CONFIG_BAUDRATE 115200
+#define CONFIG_MXC_UART_BASE UART1_BASE
-#undef CONFIG_SHOW_BOOT_PROGRESS
+/*
+ * GPIO
+ */
-#define CONFIG_ETHADDR
-#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_IPADDR 192.168.0.10
-#define CONFIG_BOARD_NAME "apf27"
-#define CONFIG_HOSTNAME "apf27"
-#define CONFIG_GATEWAYIP 192.168.0.1
-#define CONFIG_SERVERIP 192.168.0.2
-#define CONFIG_SRV_PATH ""
-#define CONFIG_ROOTPATH "/tftpboot/apf27-root"
+/*
+ * NOR
+ */
/*
- * General options for u-boot. Modify to save memory foot print
+ * NAND
*/
+#define CONFIG_NAND_MXC
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
-#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* print buffer size */
-#define CONFIG_SYS_MAXARGS 16 /* max command args */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* boot args buf size */
+#define CONFIG_MXC_NAND_REGS_BASE 0xD8000000
+#define CONFIG_SYS_NAND_BASE CONFIG_MXC_NAND_REGS_BASE
+#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_SYS_MEMTEST_START 0xA0000000 /* memtest test area */
-#define CONFIG_SYS_MEMTEST_END 0xA0300000 /*64MiB -1MiB*/
+#define CONFIG_MXC_NAND_HWECC
+#define CONFIG_SYS_NAND_LARGEPAGE
+#define IMX27_NAND_16BITS
+#define NAND_MAX_CHIPS 1
+
+/*#define CONFIG_SYS_DIRECT_FLASH_TFTP*/
+#define CONFIG_FLASH_SHOW_PROGRESS 45
+#define CONFIG_SYS_NAND_QUIET 1
+
+#define CONFIG_BOOT_TRACE_REG 0xAFFFFFF8 /* Addr to store traces of SPL boot */
-#define CONFIG_SYS_HZ 1000 /* incrementer freq: 1 MHz */
+/* Environment is in NAND */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OVERWRITE /* env is writable now */
/*
- * Definitions related to passing arguments to kernel.
+ * Partitions & Filsystems
*/
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_DOS_PARTITION
+#define CONFIG_SUPPORT_VFAT
-#define CONFIG_CMDLINE_TAG 1 /* send commandline to Kernel */
-#define CONFIG_SETUP_MEMORY_TAGS 1 /* send memory definition to kernel */
-#define CONFIG_INITRD_TAG 1 /* send initrd params */
-#undef CONFIG_VFD /* do not send framebuffer setup */
+/*
+ * UBIFS
+ */
+#define CONFIG_RBTREE
+#define CONFIG_LZO
/*
- * Malloc pool need to host env + 512 Kb reserve for other allocations.
+ * Ethernet (on SOC mx28 FEC)
*/
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (512<<10) )
+#define CONFIG_FEC_MXC
+#undef CONFIG_FEC_IMX27_DEBUG
-#define CONFIG_SYS_GBL_DATA_SIZE 256 /* size in bytes reserved for initial data */
+#define CONFIG_NET_MULTI
+#define CONFIG_FEC_MXC_PHYADDR 0x1f
+#define CONFIG_MII 1 /* MII PHY management */
-#define CONFIG_STACKSIZE (256<<10) /* stack size */
+/*
+ * FPGA
+ */
+#define CONFIG_FPGA CONFIG_SYS_SPARTAN3
+#define CONFIG_FPGA_COUNT 1
+#define CONFIG_FPGA_XILINX
+#define CONFIG_FPGA_SPARTAN3
+#define CONFIG_SYS_FPGA_WAIT 20000 /* 20 ms */
+#define CONFIG_SYS_FPGA_PROG_FEEDBACK
+#define CONFIG_SYS_FPGA_CHECK_CTRLC
+#define CONFIG_SYS_FPGA_CHECK_ERROR
+//#define CONFIG_SYS_FPGA_IS_PROTO /* to be defined with apf27 board prototype*/
+
+/* FPGA program pin configuration */
+#define CONFIG_SYS_FPGA_PWR (GPIO_PORTF | 19) /* FPGA prog pin */
+#define CONFIG_SYS_FPGA_PRG (GPIO_PORTF | 11) /* FPGA prog pin */
+#define CONFIG_SYS_FPGA_CLK (GPIO_PORTF | 15) /* FPGA clk pin */
+#define CONFIG_SYS_FPGA_RDATA 0xD6000000 /* FPGA data addr */
+#define CONFIG_SYS_FPGA_WDATA 0xD6000000 /* FPGA data addr */
+#define CONFIG_SYS_FPGA_INIT (GPIO_PORTF | 12) /* FPGA init pin */
+#define CONFIG_SYS_FPGA_DONE (GPIO_PORTF | 9) /* FPGA done pin */
+#define CONFIG_SYS_FPGA_RW (GPIO_PORTF | 21) /* FPGA done pin */
+#define CONFIG_SYS_FPGA_CS (GPIO_PORTF | 22) /* FPGA done pin */
+#define CONFIG_SYS_FPGA_SUSPEND (GPIO_PORTF | 10) /* FPGA done pin */
+#define CONFIG_SYS_FPGA_RESET (GPIO_PORTF | 7) /* FPGA done pin */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ (4<<10) /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ (4<<10) /* FIQ stack */
+/*
+ * Fuses - IIM
+ */
+#ifdef CONFIG_CMD_IMX_FUSE
+#define IIM_MAC_BANK 0
+#define IIM_MAC_ROW 5
+#define IIM0_SCC_KEY 11
+#define IIM1_SUID 1
#endif
/*
-* Clocks configuration
-*/
+ * I2C
+ */
+
+//#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
+
+//#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
+//#define CONFIG_SYS_I2C_SLAVE 0x7F
+
+//#define CONFIG_I2C_CMD_TREE
+//#define CONFIG_I2C_MULTI_BUS 2
+//#define CONFIG_SYS_I2C_NOPROBES { }
+
+# define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC02 */
+# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* 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 3
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */
+
+/*
+ * SPI
+ */
+
+/*
+ * SD/MMC
+ */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MXC_MMC
+#define CONFIG_MXC_MCI_REGS_BASE 0x10014000
+
/*
- * PLL configuration
+ * RTC
+ */
+#define CONFIG_RTC_DS1374
+#define CONFIG_SYS_RTC_BUS_NUM 0
+//#define DEBUG_RTC
+
+/*
+ * Watchdog Config
+ */
+
+/*
+ * USB
+ */
+
+/*
+ * Clocks
+ */
+#define CONFIG_SYS_HZ 1000 /* Ticks per second */
+
+/*
+ * PLL
*
* 31 | x |x| x x x x |x x x x x x x x x x |x x|x x x x|x x x x x x x x x x| 0
* |CPLM|X|----PD---|--------MFD---------|XXX|--MFI--|-----MFN-----------|
*/
-
#define CONFIG_MX27_CLK32 32768 /* 32768 or 32000 Hz crystal */
#undef CONFIG_MX27_CLK26 /* there is no external 26MHz external clock */
@@ -362,15 +518,8 @@
#define CONFIG_USB_FREQ 60 /* 60 MHz */
/*
- * SDRAM definition parameter
+ * SDRAM
*/
-#define PHYS_SDRAM_1 0xA0000000
-#define PHYS_SDRAM_2 0xB0000000
-
-#define CONFIG_NR_DRAM_BANKS 1
-
-#define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
-
#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 8)
/* micron 8MB */
#define PHYS_SDRAM_1_SIZE 0x00800000 /* 8 MB */
@@ -509,207 +658,10 @@
#define CONFIG_SYS_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
#endif
-#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-
-/* lowlevel_linit copy U-Boot at CONFIG_SYS_INIT_SP_ADDR (here in RAM) */
-/* making u-boot runnable from flash and also RAM that is usefull to boot */
-/* from serial port and from flash with only one version of U-Boot */
-#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE 0xA1000000
-#endif
-
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE \
- + PHYS_SDRAM_1_SIZE - 0x0100000)
-
-/*
- * Configuration for no NOR FLASH memory
- */
-#define CONFIG_SYS_NO_FLASH
-
-/*=====================*/
-/* Flash & Environment */
-/*=====================*/
-#define CONFIG_NAND_MXC
-
-#define CONFIG_MXC_NAND_REGS_BASE (0xD8000000)
-#define CONFIG_SYS_NAND_BASE CONFIG_MXC_NAND_REGS_BASE
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_MXC_NAND_HWECC
-#define CONFIG_SYS_NAND_LARGEPAGE
-//#define CONFIG_MTD_NAND_VERIFY_WRITE
-#define CONFIG_MTD_NAND_ECC_JFFS2
-
-//#define CONFIG_SYS_DIRECT_FLASH_TFTP 1
-#define CONFIG_FLASH_SHOW_PROGRESS 45
-#define IMX27_NAND_16BITS 1
-#define NAND_MAX_CHIPS 1
-
-#define CONFIG_BOOT_TRACE_REG 0xAFFFFFF8 /* Addr to store traces of SPL boot */
-//#define NAND_ALLOW_ERASE_ALL
-//#define CONFIG_MTD_NAND_VERIFY_WRITE 1
-//#define CONFIG_SYS_NAND_SELECT_DEVICE 0 /* nand driver supports mutipl. chips */
-//#define CONFIG_SYS_NFC_DEBUG
-//#define CONFIG_MTD_DEBUG
-//#define CONFIG_MTD_DEBUG_VERBOSE 3
-
-/*=====================*/
-
-#define CONFIG_NAND_U_BOOT
-#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_LOAD_ADDR /* Copy SPL+U-Boot here */
-#define CONFIG_SYS_NAND_U_BOOT_SIZE CONFIG_SYS_MONITOR_LEN /* Size is the partion size */
-
-/*
- * Environment setup. Definitions of monitor location and size with
- * definition of environment setup ends up in 2 possibilities.
- * 1. Embeded environment - in u-boot code is space for environment
- * 2. Environment is read from predefined sector of flash
- * Right now we support 2. possiblity, but expecting no env placed
- * on mentioned address right now. This also needs to provide whole
- * sector for it - for us 256Kb is really waste of memory. U-boot uses
- * default env. and until kernel parameters could be sent to kernel
- * env. has no sense to us.
- */
-
-#define CONFIG_SYS_MONITOR_BASE 0xAFF00000
-#define CONFIG_SYS_MONITOR_OFFSET 0x00000000
-#define CONFIG_SYS_MONITOR_LEN 0x000A0000 /* 640kB ( 5 flash blocks ) */
-#define CONFIG_ENV_IS_IN_NAND 1
-#define CONFIG_ENV_OFFSET 0x000A0000 /* NAND offset address for now*/
-#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
-#define CONFIG_ENV_RANGE 0X00060000 /* 384kB ( 3 flash blocks ) */
-#define CONFIG_ENV_OVERWRITE 1 /* env is writable now */
-#define CONFIG_FIRMWARE_OFFSET 0x00100000
-#define CONFIG_FIRMWARE_LEN 0x00080000 /* 512kB ( 4 flash blocks ) */
-#define CONFIG_KERNEL_OFFSET 0x00180000
-#define CONFIG_KERNEL_LEN 0x00500000 /* 5.0MB */
-#define CONFIG_ROOTFS_OFFSET 0x00680000
-#define CONFIG_ROOTFS_LEN /* entire flash if not specified ~116MB*/
-
-/*
- * Default load address for user programs and kernel
- */
-#define CONFIG_SYS_LOAD_ADDR 0xA0000000
-#define CONFIG_LOADADDR 0xA0000000
-#define CONFIG_SYS_TFTP_LOADADDR 0xA0000000
-
-/*
- * Partitions & Filsystems
- */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
-#define CONFIG_SUPPORT_VFAT
-
-#define CONFIG_SUPPORT_VFAT
-
-/*
- * JFFS2
- */
-#define CONFIG_JFFS2_NAND 1
-#define CONFIG_JFFS2_CMDLINE 1
-
-/*
- * This is setting for JFFS2 support in u-boot.
- * NOTE: Enable CONFIG_SYS_CMD_JFFS2 for JFFS2 support.
- */
-#define CONFIG_SYS_JFFS_CUSTOM_PART
-
/*
- * UBIFS
+ * External interface
*/
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-
/*
- * Hardware drivers
- */
-
-/* FEC IMX27 ethernet chipset */
-#define CONFIG_FEC_MXC
-#undef CONFIG_FEC_IMX27_DEBUG
-
-#define CONFIG_NET_MULTI
-#define CONFIG_FEC_MXC_PHYADDR 0x1f
-#define CONFIG_MII 1 /* MII PHY management */
-
-/*-----------------------------------------------------------------------
- * FPGA stuff
- */
-#define CONFIG_FPGA CONFIG_SYS_SPARTAN3
-//#define FPGA_DEBUG
-#define CONFIG_FPGA_COUNT 1
-#define CONFIG_FPGA_XILINX
-#define CONFIG_FPGA_SPARTAN3
-#define CONFIG_SYS_FPGA_WAIT 20000 /* 20 ms */
-#define CONFIG_SYS_FPGA_PROG_FEEDBACK
-#define CONFIG_SYS_FPGA_CHECK_CTRLC
-#define CONFIG_SYS_FPGA_CHECK_ERROR
-//#define CONFIG_SYS_FPGA_IS_PROTO /* to be defined with apf27 board prototype*/
-
-/* FPGA program pin configuration */
-#define CONFIG_SYS_FPGA_PWR (GPIO_PORTF | 19) /* FPGA prog pin */
-#define CONFIG_SYS_FPGA_PRG (GPIO_PORTF | 11) /* FPGA prog pin */
-#define CONFIG_SYS_FPGA_CLK (GPIO_PORTF | 15) /* FPGA clk pin */
-#define CONFIG_SYS_FPGA_RDATA 0xD6000000 /* FPGA data addr */
-#define CONFIG_SYS_FPGA_WDATA 0xD6000000 /* FPGA data addr */
-#define CONFIG_SYS_FPGA_INIT (GPIO_PORTF | 12) /* FPGA init pin */
-#define CONFIG_SYS_FPGA_DONE (GPIO_PORTF | 9) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_RW (GPIO_PORTF | 21) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_CS (GPIO_PORTF | 22) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_SUSPEND (GPIO_PORTF | 10) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_RESET (GPIO_PORTF | 7) /* FPGA done pin */
-
-/*
- * I2C bus
- */
-
-//#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
-
-//#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
-//#define CONFIG_SYS_I2C_SLAVE 0x7F
-
-//#define CONFIG_I2C_CMD_TREE
-//#define CONFIG_I2C_MULTI_BUS 2
-//#define CONFIG_SYS_I2C_NOPROBES { }
-
-# define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC02 */
-# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* 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 3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */
-
-/*
- * RTC
- */
-#define CONFIG_RTC_DS1374
-#define CONFIG_SYS_RTC_BUS_NUM 0
-//#define DEBUG_RTC
-
-/*
- * SD/MMC
- */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MXC_MMC
-#define CONFIG_MXC_MCI_REGS_BASE 0x10014000
-
-/**
- * IIM fuse Config
- */
-
-#ifdef CONFIG_CMD_IMX_FUSE
-#define IIM_MAC_BANK 0
-#define IIM_MAC_ROW 5
-#define IIM0_SCC_KEY 11
-#define IIM1_SUID 1
-#endif /*CONFIG_CMD_IMX_FUSE */
-
-/*
- * External interfaces module
- *
* CSCRxU_VAL:
* 31| x | x | x x |x x x x| x x | x | x |x x x x|16
* |SP |WP | BCD | BCS | PSZ |PME|SYNC| DOL |
@@ -868,7 +820,7 @@
#define CONFIG_SYS_GPCR_VAL 0x0003000F
/* LPDDR enable. latency hiding behavior enabled */
-//#define CONFIG_SYS_ESDMISC_VAL ESDMISC_MA10_SHARE+ESDMISC_MDDREN
+//#define CONFIG_SYS_ESDMISC_VAL ESDMISC_MA10_SHARE+ESDMISC_MDDREN
/*
* safe value in case of erratic crash during boot
* (seen with some prototype boards)*/
@@ -890,9 +842,6 @@
#define CONFIG_SYS_PCCR0_VAL 0x05070400
#define CONFIG_SYS_PCCR1_VAL 0xA14A0408
-/* CONFIG_SKIP_LOWLEVEL_INIT bypass lowlevel init in bootstrap mode */
-#undef CONFIG_SKIP_LOWLEVEL_INIT
-
/*
* From here, there should not be any user configuration.
* All Equations are automatic
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index a18a099..20060f6 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -1,9 +1,7 @@
/*
- * Configuration settings for the Armadeus Project apf28 board.
+ * Configuration settings for the Armadeus Project motherboard APF28.
*
- * Copyright (C) 2011-2012 Eric Jarrige, Armadeus Project
- * Copyright (C) 2011 Marek Vasut <mar...@gm...>
- * on behalf of DENX Software Engineering GmbH
+ * Copyright (C) 2011-2012 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
@@ -20,34 +18,39 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
-#ifndef __APF28_H__
-#define __APF28_H__
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
#include <asm/arch/regs-base.h>
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.5"
+#define CONFIG_ENV_VERSION "0.6"
#define CONFIG_IDENT_STRING " apf28 patch 0.7"
+#define CONFIG_BOARD_NAME apf28
/*
* SoC configurations
*/
-#define CONFIG_MX28 /* i.MX28 SoC */
-#define CONFIG_MXS_GPIO /* GPIO control */
-#define CONFIG_SYS_HZ 1000 /* Ticks per second */
+#define CONFIG_MX28 /* i.MX28 SoC */
+#define CONFIG_MACH_TYPE 3845 /* APF9328 */
/*
- * Define APF28 machine type by hand until it lands in mach-types
+ * Enable the call to miscellaneous platform dependent initialization.
*/
-#define CONFIG_MACH_TYPE 3845
-
-#define CONFIG_SYS_NO_FLASH
+#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h> */
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_ARCH_MISC_INIT
/*
+ * Board display option
+ */
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DOS_PARTITION
+
+/*
* SPL
*/
#define CONFIG_SPL
@@ -65,38 +68,39 @@
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_DNS
+#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOARD_NAME apf28
-#define CONFIG_HOSTNAME "apf28"
+#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
#define CONFIG_SRV_PATH ""
-#define CONFIG_ROOTPATH "/tftpboot/apf28-root"
+#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
/*
* U-Boot Commands
*/
#include <config_cmd_default.h>
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DOS_PARTITION
+#define CONFIG_CMD_ASKENV /* ask for env variable */
+#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE
#define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_DNS
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_GPIO
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
+#define CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_NET
+#define CONFIG_CMD_NAND_LOCK_UNLOCK
+#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_USB
-
-#define CONFIG_CMD_ASKENV /* ask for env variable */
-#define CONFIG_CMD_BSP /* Board Specific functions */
-#define CONFIG_CMD_NAND_LOCK_UNLOCK
-#define CONFIG_CMD_NAND_TRIMFFS
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_UBIFS
/*
* Memory configurations
@@ -104,12 +108,12 @@
#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
#define PHYS_SDRAM_1 0x40000000 /* Base address */
#define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MiB RAM */
-#define CONFIG_STACKSIZE 0x00010000 /* 128 KB stack */
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+/*#define CONFIG_STACKSIZE 0x00010000*//* 128 KB stack */
#define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* Initial data */
#define CONFIG_SYS_MEMTEST_START 0x40000000 /* Memtest start adr */
#define CONFIG_SYS_MEMTEST_END 0x40400000 /* 4 MB RAM test */
-#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
/* Point initial SP in SRAM so SPL can use it too. */
#define CONFIG_SYS_INIT_RAM_ADDR 0x00002000
@@ -118,11 +122,7 @@
(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)
-/*
- * We need to sacrifice first 4 bytes of RAM here to avoid triggering some
- * strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot
- * binary. In case there was more of this mess, 0x100 bytes are skipped.
- */
+
#define CONFIG_SYS_TEXT_BASE 0x44000000
/*
@@ -144,66 +144,6 @@
#define CONFIG_ROOTFS_OFFSET 0x00C00000
#define CONFIG_ROOTFS_LEN /* entire flash if not specified */
-/*
- * U-Boot general configurations
- */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "BIOS> "
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- /* Print buffer size */
-#define CONFIG_SYS_MAXARGS 32 /* 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
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-
-/*
- * Serial Driver
- */
-#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 */
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-
-/*
- * MMC Driver
- */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MXS_MMC
-#endif
-
-/*
- * NAND
- */
-#ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_MXS
-#define CONFIG_APBH_DMA
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_SYS_NAND_BASE 0x60000000
-#define CONFIG_SYS_NAND_5_ADDR_CYCLE
-#define CONFIG_FLASH_SHOW_PROGRESS 45
-#define NAND_MAX_CHIPS 1
-
-/* Environment is in NAND */
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_SECT_SIZE (128 * 1024)
-#define CONFIG_ENV_OVERWRITE
-
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTDMAP "gpmi-nfc-main"
#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT \
@@ -213,77 +153,34 @@
"512K(redundant-environment)," \
"8M(kernel)," \
"-(rootfs)"
-#endif
-
-/*
- * Ethernet on SOC (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_M28_FEC_MAC_IN_OCOTP
-#define CONFIG_NETCONSOLE 1
-#endif
-#define ACFG_OUI 0x001EAC
/*
- * I2C
- */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_I2C_MXS
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED 400000
-#endif
-
-/*
- * RTC
- */
-#ifdef CONFIG_CMD_DATE
-/* Use the internal RTC in the MXS chip */
-#define CONFIG_RTC_INTERNAL
-#define CONFIG_RTC_MXS
-#endif
-
-/*
- * 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
-#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
-#endif
-
-/*
- * OCOTP
+ * U-Boot general configurations
*/
-
-/*#define CONFIG_IMX_OCOTP*/
-#define IMX_OCOTP_BASE MXS_OCOTP_BASE
+#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_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
/*
* Boot Linux
*/
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
+#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
#define CONFIG_BOOTFILE MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
@@ -293,14 +190,18 @@
#define CONFIG_CONSOLE "console=ttyAM0,"MK_STR(CONFIG_BAUDRATE)
#define CONFIG_BOOTCOMMAND "run ubifsboot"
#define CONFIG_SYS_AUTOLOAD "no"
-#define CONFIG_LOADADDR 0x40000000
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
+/*
+ * Default load address for user programs and kernel
+ */
+#define CONFIG_LOADADDR 0x40000000
+#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
+#define CONFIG_SYS_TFTP_LOADADDR CONFIG_LOADADDR
/*
* Extra Environments
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
- "env_version=" CONFIG_ENV_VERSION "\0" \
+ "env_version=" CONFIG_ENV_VERSION "\0" \
"console=" CONFIG_CONSOLE "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nand0,4\0" \
@@ -369,5 +270,136 @@
"update_all=run download_kernel flash_kernel download_rootfs " \
"flash_rootfs download_uboot flash_uboot\0"
+/*
+ * Serial Driver
+ */
+#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 */
+#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
+
+/*
+ * GPIO
+ */
+#define CONFIG_MXS_GPIO
+
+/*
+ * NOR
+ */
+
+/*
+ * 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*/
+#define CONFIG_FLASH_SHOW_PROGRESS 45
+#define CONFIG_SYS_NAND_QUIET 1
+
+/* Environment is in NAND */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OVERWRITE
+
+/*
+ * 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 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_M28_FEC_MAC_IN_OCOTP
+#define CONFIG_NETCONSOLE 1
+#endif
+#define ACFG_OUI 0x001EAC
+
+/*
+ * Fuses - OCOTP
+ */
+/*#define CONFIG_IMX_OCOTP*/
+#define IMX_OCOTP_BASE MXS_OCOTP_BASE
+
+/*
+ * I2C
+ */
+#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
+#endif
+
+/*
+ * SD/MMC
+ */
+#ifdef CONFIG_CMD_MMC
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MXS_MMC
+#endif
+
+/*
+ * RTC
+ */
+#ifdef CONFIG_CMD_DATE
+/* Use the internal RTC in the MXS chip */
+#define CONFIG_RTC_INTERNAL
+#define CONFIG_RTC_MXS
+#endif
+
+/*
+ * Watchdog Config
+ */
+
+/*
+ * 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
+#endif
+
+/*
+ * Clocks
+ */
+#define CONFIG_SYS_HZ 1000 /* Ticks per second */
-#endif /* __APF28_H__ */
+#endif /* __CONFIG_H */
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
index 3930e2d..2f5f8d8 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
@@ -1,8 +1,8 @@
/*
*
- * Configuration settings for the Armadeus Project apf51 board.
+ * Configuration settings for the Armadeus Project motherboard APF51
*
- * (C) Copyright 2010-2012 Eric Jarrige, Armadeus Project
+ * Copyright (C) 2010-2012 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
@@ -18,53 +18,136 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
- *
- * 2010/03/31 Initial version based on apf27 configuration file
- * 2011/05/02 patch V0.5 updates NAND OOB to be mx51 linux kernel compliant
- * (at least for the first 11 spare bytes..)
*/
#ifndef __CONFIG_H
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.7"
-#define CONFIG_IDENT_STRING " apf51 patch 0.9"
+#define CONFIG_ENV_VERSION "0.8"
+#define CONFIG_IDENT_STRING " apf51 patch 0.10"
+#define CONFIG_BOARD_NAME apf51
/*
- * High Level Configuration Options
- * (easy to change)
+ * SoC configurations
*/
-
#define CONFIG_ARMV7 /* This is armv7 Cortex-A8 CPU */
#define CONFIG_MX51 /* in a Freescale i.MX51 Chip */
-#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
#define CONFIG_MACH_TYPE 2795 /* APF51 */
+/*
+ * 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_MISC_INIT_R
+#define CONFIG_BOARD_LATE_INIT
+
+/*
+ * Board display option
+ */
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_SHOW_BOOT_PROGRESS
-#define CONFIG_SYS_TEXT_BASE 0x97000000
+/*
+ * 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_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_SIZE CONFIG_SYS_MONITOR_LEN
/*
- * Select serial console configuration
+ * BOOTP options
*/
-#define CONFIG_MXC_UART
-#define CONFIG_MXC_UART_BASE UART3_BASE
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_BAUDRATE 115200
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+/*
+#define CONFIG_BOOTP_DNS
+#define CONFIG_BOOTP_DNS2
+*/
+
+#define CONFIG_NETMASK 255.255.255.0
+#define CONFIG_IPADDR 192.168.0.10
+#define CONFIG_GATEWAYIP 192.168.0.1
+#define CONFIG_SERVERIP 192.168.0.2
+
+#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
+#define CONFIG_SRV_PATH ""
+#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
/*
- * Boot options. Setting delay to -1 stops autostart count down.
+ * U-Boot Commands
*/
-#define CONFIG_BOOTDELAY 5
-#define CONFIG_ZERO_BOOTDELAY_CHECK
+#include <config_cmd_default.h>
-#define CONFIG_BOOTARGS \
- CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
+#define CONFIG_CMD_ASKENV /* ask for env variable */
+#define CONFIG_CMD_BSP /* Board Specific functions */
+#define CONFIG_CMD_CACHE /* icache, dcache */
+#define CONFIG_CMD_DHCP /* DHCP Support */
+/*#define CONFIG_CMD_DNS*/
+#define CONFIG_CMD_I2C /* I2C serial bus support */
+#define CONFIG_CMD_IIM /* imx iim fuse */
+#define CONFIG_CMD_MTDPARTS /* MTD partition support */
+#define CONFIG_CMD_NAND /* NAND support */
+#define CONFIG_CMD_NAND_LOCK_UNLOCK
+#define CONFIG_CMD_NAND_TRIMFFS
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PING /* ping support */
+/*#define CONFIG_CMD_SAVES*/ /* save S record dump */
+/*#define CONFIG_CMD_SETEXPR*/ /* setexpr support */
+/*#define CONFIG_CMD_UBI*/
+/*#define CONFIG_CMD_UBIFS*/
+
+/*
+ * Memory configurations
+ */
+#define CONFIG_NR_DRAM_BANKS 2
+#define CONFIG_NR_DRAM_POPULATED 1
+#define CONFIG_SYS_SDRAM_BASE CSD0_BASE_ADDR /* SDRAM bank #1 */
+#define PHYS_SDRAM_SIZE 256
+#define PHYS_SDRAM_1_SIZE (PHYS_SDRAM_SIZE) * 1024 * 1024
+#define PHYS_SDRAM_2_SIZE (PHYS_SDRAM_SIZE) * 1024 * 1024
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (2 * 1024 * 1024) )
+#define CONFIG_SYS_MEMTEST_START 0x90000000 /* memtest works on */
+#define CONFIG_SYS_MEMTEST_END 0x90100000 /* 1st MiB in DRAM */
+
+#define CONFIG_SYS_INIT_RAM_ADDR (IRAM_BASE_ADDR)
+#define CONFIG_SYS_INIT_RAM_SIZE (IRAM_SIZE)
+
+#define CONFIG_SYS_GBL_DATA_OFFSET \
+ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
+#define CONFIG_SYS_INIT_SP_ADDR \
+ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+
+#define CONFIG_SYS_TEXT_BASE 0x97000000
+
+/*
+ * FLASH organization
+ */
+#define CONFIG_SYS_MONITOR_OFFSET 0x00000000 /* offset in NAND */
+#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 1MB */
+#define CONFIG_ENV_OFFSET 0x00100000 /* NAND offset */
+#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
+#define CONFIG_ENV_RANGE 0x00100000 /* 1MB */
+#define CONFIG_FIRMWARE_OFFSET 0x00200000
+#define CONFIG_FIRMWARE_LEN 0x00100000 /* 1MB */
+#define CONFIG_KERNEL_OFFSET 0x00300000
+#define CONFIG_KERNEL_LEN 0x00800000 /* 8MB (BB ready) */
+#define CONFIG_ROOTFS_OFFSET 0x00B00000
+#define CONFIG_ROOTFS_LEN /* entire flash if not specified */
-#define CONFIG_CONSOLE "console=ttymxc2,"MK_STR(CONFIG_BAUDRATE)
#define CONFIG_MTDMAP "mxc_nand"
#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":1M(U-boot)ro," \
@@ -72,6 +155,53 @@
"8M(kernel)," \
"-(rootfs)"
+/*
+ * U-Boot general configurations
+ */
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
+#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
+#define CONFIG_SYS_PBSIZE \
+ (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
+ /* Print buffer size */
+#define CONFIG_SYS_MAXARGS 16 /* max command args */
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+ /* Boot argument buffer size */
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
+#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
+
+/*
+ * 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
+#define CONFIG_BOOTFILE "${board_name}-linux.bin"
+#define CONFIG_BOOTARGS \
+ CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
+
+#define CONFIG_CONSOLE "console=ttymxc2,"MK_STR(CONFIG_BAUDRATE)
+#define CONFIG_BOOTCOMMAND "run ubifsboot"
+#define CONFIG_SYS_AUTOLOAD "no"
+/*
+ * Default load address for user programs and kernel
+ */
+#define CONFIG_LOADADDR 0x90000000
+#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
+#define CONFIG_SYS_TFTP_LOADADDR CONFIG_LOADADDR
+
+/*
+ * Extra Environments
+ */
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
"fileaddr=" MK_STR(CONFIG_SYS_LOAD_ADDR) "\0" \
@@ -94,7 +224,6 @@
"ntpserverip=217.147.208.1\0" \
"mmcroot=/dev/mmcblk0p1\0" \
"mmcrootfstype=ext2\0" \
- "quiet=1\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
"addubifsargs=setenv bootargs ${bootargs} " \
@@ -140,8 +269,7 @@
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
- "flash_reset_env=nand unlock ${env_offset} ${env_len};" \
- "nand erase ${env_offset} ${env_len};" \
+ "flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-u-boot.bin\0" \
@@ -154,260 +282,65 @@
"update_rootfs=run download_rootfs flash_rootfs\0" \
"update_all=run download_kernel flash_kernel download_rootfs " \
"flash_rootfs download_uboot flash_uboot\0" \
- "unlock_regs=mw 10000008 0; mw 10020008 0;TODO\0"
-
-#define CONFIG_BOOTCOMMAND "run ubifsboot"
-
-#define CONFIG_SYS_AUTOLOAD "no"
+ "unlock_regs=echo unlock_reg not needed anymore\0"
/*
- * BOOTP options
+ * Serial Driver
*/
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_BOOTFILESIZE
-
-/*
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_DNS2
-*/
-
-#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_IPADDR 192.168.0.10
-#define CONFIG_BOARD_NAME "apf51"
-#define CONFIG_HOSTNAME "apf51"
-#define CONFIG_GATEWAYIP 192.168.0.1
-#define CONFIG_SERVERIP 192.168.0.2
-#define CONFIG_SRV_PATH ""
-#define CONFIG_ROOTPATH "/tftpboot/apf51-root"
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ASKENV /* ask for env variable */
-#define CONFIG_CMD_BSP /* Board Specific functions */
-#define CONFIG_CMD_CACHE /* icache, dcache */
-#define CONFIG_CMD_DHCP /* DHCP Support */
-#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
-#define CONFIG_CMD_I2C /* I2C serial bus support */
-#define CONFIG_CMD_IIM /* imx iim fuse */
-#undef CONFIG_CMD_IMLS /* List all found images */
-#define CONFIG_CMD_MTDPARTS /* MTD partition support */
-#define CONFIG_CMD_NAND /* NAND support */
-#define CONFIG_CMD_NAND_LOCK_UNLOCK
-#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_NFS
-#define CONFIG_CMD_PING /* ping support */
-
-/*
- * Select some advanced features of the commande line parser
- */
-
-#define CONFIG_BOOT_PARAMS_ADDR 0x90000100
-
-/**
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
-#define CONFIG_AUTO_COMPLETE /* Enable auto completion of */
- /* commands using TAB */
-
-#define CONFIG_SYS_CBSIZE 1024 /* console I/O buffer */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
- /* print buffer size */
-#define CONFIG_SYS_MAXARGS 16 /* max command args */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
- /* boot args buf size */
-
-#define CONFIG_SYS_MEMTEST_START 0x90000000 /* memtest works on */
-#define CONFIG_SYS_MEMTEST_END 0x90100000 /* 1st MiB in DRAM */
-
-/*
- * Default load address for user programs and kernel
- */
-#define CONFIG_SYS_LOAD_ADDR 0x90000000
-#define CONFIG_LOADADDR 0x90000000
-
-#define CONFIG_SYS_HZ 1000 /* incrementer freq: 1 ms */
-
-/*
- * Low Level Configuration Settings
- * (address mappings, register initial values, etc.)
- * You should know what you are doing if you make changes here.
- */
-
-/*-----------------------------------------------------------------------
- * Definitions for initial stack pointer and data area (in DPRAM)
- */
-#define CONFIG_SYS_INIT_RAM_ADDR (IRAM_BASE_ADDR)
-#define CONFIG_SYS_INIT_RAM_SIZE (IRAM_SIZE)
-
-#define CONFIG_SYS_GBL_DATA_OFFSET \
- (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-#define CONFIG_SYS_INIT_SP_ADDR \
- (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
-/*
- * Malloc pool need to host env. + 2 MB reserve for other allocations.
- */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (2 * 1024 * 1024) )
-
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE (128<<10) /* stack size */
-#define CONFIG_STACKSIZE_IRQ (4<<10) /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ (4<<10) /* FIQ stack */
-#endif
-
-/*
- * CPU Flash boot constants
- */
-#ifndef CONFIG_DOWNLOAD_BY_DEBUGGER
-#define CONFIG_FLASH_HEADER
-#define CONFIG_FLASH_HEADER_OFFSET 0x400
-#define CONFIG_FLASH_HEADER_BARKER 0xB1
-#endif
+#define CONFIG_MXC_UART
+#define CONFIG_MXC_UART_BASE UART3_BASE
+#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
+#define CONFIG_BAUDRATE 115200
/*
- * Enable the call to miscellaneous platform dependent initialization.
+ * GPIO
*/
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MISC_INIT_R
-#define CONFIG_BOARD_LATE_INIT
+#define CONFIG_MXC_GPIO
/*
- * Definitions related to passing arguments to kernel.
- */
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-/*
-#define CONFIG_REVISION_TAG
-#define CONFIG_OF_LIBFDT
-*/
-/*
- * SDRAM Configs
+ * NOR
*/
-#define CONFIG_NR_DRAM_BANKS 2
-#define CONFIG_NR_DRAM_POPULATED 1
-#define CONFIG_SYS_SDRAM_BASE CSD0_BASE_ADDR /* SDRAM bank #1 */
-#define PHYS_SDRAM_SIZE 256
-#define PHYS_SDRAM_1_SIZE (PHYS_SDRAM_SIZE) * 1024 * 1024
-#define PHYS_SDRAM_2_SIZE (PHYS_SDRAM_SIZE) * 1024 * 1024
/*
- * FLASH organization
- */
-#define CONFIG_SYS_MONITOR_OFFSET 0x00000000 /* offset in NAND */
-#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 1MB */
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET 0x00100000 /* NAND offset */
-#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
-#define CONFIG_ENV_RANGE 0x00100000 /* 1MB */
-#define CONFIG_ENV_OVERWRITE /* env is writable now */
-#define CONFIG_FIRMWARE_OFFSET 0x00200000
-#define CONFIG_FIRMWARE_LEN 0x00100000 /* 1MB */
-#define CONFIG_KERNEL_OFFSET 0x00300000
-#define CONFIG_KERNEL_LEN 0x00800000 /* 8MB (BB ready) */
-#define CONFIG_ROOTFS_OFFSET 0x00B00000
-#define CONFIG_ROOTFS_LEN /* entire flash if not specified */
-
-/*
- * Configuration for no NOR FLASH memory
- */
-#define CONFIG_SYS_NO_FLASH
-
-/*=====================*/
-/* Flash & Environment */
-/*=====================*/
-#define CONFIG_ENV_SECT_SIZE (128 * 1024)
-
-/*-----------------------------------------------------------------------
- * NAND FLASH driver setup
+ * NAND
*/
#define CONFIG_NAND_MXC_V2
#define CONFIG_MXC_NAND_REGS_BASE 0xCFFF0000
#define CONFIG_SYS_NAND_BASE CONFIG_MXC_NAND_REGS_BASE
#define CONFIG_SYS_MAX_NAND_DEVICE 1
+
#define CONFIG_MXC_NAND_HWECC
#define CONFIG_SYS_NAND_LARGEPAGE
-/*#define CONFIG_MTD_NAND_VERIFY_WRITE*/
+#define NAND_MAX_CHIPS 1
/*#define CONFIG_SYS_DIRECT_FLASH_TFTP*/
#define CONFIG_FLASH_SHOW_PROGRESS 45
-#define NAND_MAX_CHIPS 1
-
-/*=====================*/
+#define CONFIG_SYS_NAND_QUIET 1
-#define CONFIG_NAND_U_BOOT
-/* Copy SPL+U-Boot here */
-#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_LOAD_ADDR
-/* Size is the partion size */
-#define CONFIG_SYS_NAND_U_BOOT_SIZE CONFIG_SYS_MONITOR_LEN
-/*
-#define CONFIG_NAND_ENV_DST
-#define CONFIG_ENV_OFFSET_REDUND
-*/
+/* Environment is in NAND */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OVERWRITE /* env is writable now */
/*
* Partitions & Filsystems
*/
-#undef CONFIG_PARTITIONS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-
-/**
- * I2C Configs
- */
-#define CONFIG_HARD_I2C /* I2C with hardware support */
-#define CONFIG_I2C_MXC 1
-#define CONFIG_SYS_I2C_PORT I2C2_BASE_ADDR
-#define CONFIG_SYS_I2C_MX51_PORT2
-#define CONFIG_SYS_I2C_SPEED 400000
-#define CONFIG_SYS_I2C_SLAVE 0xfe
-
-/**
- * RTC PMIC TODO TODO TODO TODO
- */
-
/*
- * SD/MMC Configs
- */
-
-/**
- * SPI Configs
- */
-
-/**
- * Watchdog Config
- */
-
-#define CONFIG_HW_WATCHDOG
-
-/**
- * IIM fuse Config
- */
-
-#define CONFIG_IMX_IIM
-#define CONFIG_IIM_MAC_BANK 1
-#define CONFIG_IIM_MAC_ROW 9
+#define CONFIG_DOS_PARTITION
+#define CONFIG_SUPPORT_VFAT
+*/
-/**
- * GPIO: Support for MXC GPIO
+/*
+ * UBIFS
*/
+/*
+#define CONFIG_RBTREE
+#define CONFIG_LZO
+*/
-#define CONFIG_MXC_GPIO
-
-/**
- * Ethernet: Support for internal Fast Ethernet Controller
+/*
+ * Ethernet (on SOC mx51 FEC)
*/
#define CONFIG_FEC_MXC
#define IMX_FEC_BASE FEC_BASE_ADDR
@@ -421,7 +354,6 @@
* FPGA
*/
#define CONFIG_FPGA CONFIG_SYS_SPARTAN3
-/*#define FPGA_DEBUG*/
#define CONFIG_FPGA_COUNT 1
#define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_SPARTAN3
@@ -449,11 +381,50 @@
#define ACFG_FPGA_WCR2_VALUE 0x00000000
/*
-* Clocks configuration
-*/
+ * Fuses - IIM
+ */
+
+#define CONFIG_IMX_IIM
+#define CONFIG_IIM_MAC_BANK 1
+#define CONFIG_IIM_MAC_ROW 9
+
+/*
+ * I2C
+ */
+#define CONFIG_HARD_I2C /* I2C with hardware support */
+#define CONFIG_I2C_MXC 1
+#define CONFIG_SYS_I2C_PORT I2C2_BASE_ADDR
+#define CONFIG_SYS_I2C_MX51_PORT2
+#define CONFIG_SYS_I2C_SPEED 400000
+#define CONFIG_SYS_I2C_SLAVE 0xfe
+
+/*
+ * SPI
+ */
+
+/*
+ * SD/MMC
+ */
+
+/*
+ * RTC
+ */
+
+/*
+ * Watchdog Config
+ */
+#define CONFIG_HW_WATCHDOG
+
+/*
+ * USB
+ */
-#define CONFIG_SYS_MX5_CLK32 32768
-#define CONFIG_SYS_MX5_HCLK 1024*CONFIG_SYS_MX5_CLK32
+/*
+ * Clocks
+ */
+#define CONFIG_SYS_HZ 1000 /* Ticks per second */
+#define CONFIG_SYS_MX5_CLK32 32768
+#define CONFIG_SYS_MX5_HCLK 1024*CONFIG_SYS_MX5_CLK32
#define CONFIG_MX51_PLL_ERRATA
/* external bus frequencies */
@@ -484,10 +455,6 @@
//#define APF_LPSR_CLK 0 /* MHz */
#define APF_PGC_CLK 66 /* MHz 66.5 MHz */
-/**
- * iMX51 PLL constants
- */
-
/* PLL parameters assuming 32.768kHz *1024 input clock with doubler ON */
/* MFI PDF */
#define DP_OP_864 ((11 << 4) + ((2 - 1) << 0))
@@ -514,83 +481,12 @@
#define DP_MFD_216 (262144 - 1)
#define DP_MFN_216 12223
-/*-----------------------------------------------------------------------
- * Physical Memory Map
- */
-
#define CONFIG_SYS_DDR_CLKSEL 0
/*
- * Hardware drivers
+ * SDRAM
*/
-
-/*-----------------------------------------------------------------------
- * WEIM - EIM
- */
- /* force BCLK free run */
-#define ACFG_WCR_VALUE 0x00000021
-#define ACFG_WIAR_VALUE 0x00000010
-
-/* CS1 */
-#define ACFG_CS1GCR1_VALUE ACFG_FPGA_GCR1_VALUE
-#define ACFG_CS1GCR2_VALUE ACFG_FPGA_GCR2_VALUE
-
-#define ACFG_CS1RCR1_VALUE ACFG_FPGA_RCR1_VALUE
-#define ACFG_CS1RCR2_VALUE ACFG_FPGA_RCR2_VALUE
-
-#define ACFG_CS1WCR1_VALUE ACFG_FPGA_WCR1_VALUE
-#define ACFG_CS1WCR2_VALUE ACFG_FPGA_WCR2_VALUE
-
-/* CS2 */
-#define ACFG_CS2GCR1_VALUE 0x00010080
-#define ACFG_CS2GCR2_VALUE 0x00000000
-
-#define ACFG_CS2RCR1_VALUE 0x00000000
-#define ACFG_CS2RCR2_VALUE 0x00000000
-
-#define ACFG_CS2WCR1_VALUE 0x00000000
-#define ACFG_CS2WCR2_VALUE 0x00000000
-
-/* CS3 */
-#define ACFG_CS3GCR1_VALUE 0x00010080
-#define ACFG_CS3GCR2_VALUE 0x00000000
-
-#define ACFG_CS3RCR1_VALUE 0x00000000
-#define ACFG_CS3RCR2_VALUE 0x00000000
-
-#define ACFG_CS3WCR1_VALUE 0x00000000
-#define ACFG_CS3WCR2_VALUE 0x00000000
-
-/* CS4 */
-#define ACFG_CS4GCR1_VALUE 0x00010080
-#define ACFG_CS4GCR2_VALUE 0x00000000
-
-#define ACFG_CS4RCR1_VALUE 0x00000000
-#define ACFG_CS4RCR2_VALUE 0x00000000
-
-#define ACFG_CS4WCR1_VALUE 0x00000000
-#define ACFG_CS4WCR2_VALUE 0x00000000
-
-/* CS5 */
-#define ACFG_CS5GCR1_VALUE 0x00010080
-#define ACFG_CS5GCR2_VALUE 0x00000000
-
-#define ACFG_CS5RCR1_VALUE 0x00000000
-#define ACFG_CS5RCR2_VALUE 0x00000000
-
-#define ACFG_CS5WCR1_VALUE 0x00000000
-#define ACFG_CS5WCR2_VALUE 0x00000000
-
-#include <asm/arch/imx-regs.h>
-
/*
- * From here, there should not be any user configuration.
- * All Equations are automatic
- */
-
-/**
- * SDRAM controler configs
- *
* ACFG_SDRAM_NUM_COL 8, 9, 10 or 11 column address bits
* ACFG_SDRAM_NUM_ROW 11, 12 or 13 row address bits
* ACFG_SDRAM_REFRESH 0=OFF 1=2048 2=4096 3=8192.. refresh
@@ -611,7 +507,6 @@
* ACFG_SDRAM_SINGLE_ACCESS 1= single access; 0 = Burst mode
*
*/
-
#if (PHYS_SDRAM_SIZE == 64) /* micron MT46H16M32LF -6 */
/* micron 64MB */
#define ACFG_SDRAM_NUM_COL 9 /* 8..11 column address bits */
@@ -678,6 +573,69 @@
#define ACFG_SDRAM_SINGLE_ACCESS 0 /* 0..1 */
#endif
+/*
+ * External interface
+ */
+ /* force BCLK free run */
+#define ACFG_WCR_VALUE 0x00000021
+#define ACFG_WIAR_VALUE 0x00000010
+
+/* CS1 */
+#define ACFG_CS1GCR1_VALUE ACFG_FPGA_GCR1_VALUE
+#define ACFG_CS1GCR2_VALUE ACFG_FPGA_GCR2_VALUE
+
+#define ACFG_CS1RCR1_VALUE ACFG_FPGA_RCR1_VALUE
+#define ACFG_CS1RCR2_VALUE ACFG_FPGA_RCR2_VALUE
+
+#define ACFG_CS1WCR1_VALUE ACFG_FPGA_WCR1_VALUE
+#define ACFG_CS1WCR2_VALUE ACFG_FPGA_WCR2_VALUE
+
+/* CS2 */
+#define ACFG_CS2GCR1_VALUE 0x00010080
+#define ACFG_CS2GCR2_VALUE 0x00000000
+
+#define ACFG_CS2RCR1_VALUE 0x00000000
+#define ACFG_CS2RCR2_VALUE 0x00000000
+
+#define ACFG_CS2WCR1_VALUE 0x00000000
+#define ACFG_CS2WCR2_VALUE 0x00000000
+
+/* CS3 */
+#define ACFG_CS3GCR1_VALUE 0x00010080
+#define ACFG_CS3GCR2_VALUE 0x00000000
+
+#define ACFG_CS3RCR1_VALUE 0x00000000
+#define ACFG_CS3RCR2_VALUE 0x00000000
+
+#define ACFG_CS3WCR1_VALUE 0x00000000
+#define ACFG_CS3WCR2_VALUE 0x00000000
+
+/* CS4 */
+#define ACFG_CS4GCR1_VALUE 0x00010080
+#define ACFG_CS4GCR2_VALUE 0x00000000
+
+#define ACFG_CS4RCR1_VALUE 0x00000000
+#define ACFG_CS4RCR2_VALUE 0x000...
[truncated message content] |
|
From: jscheer <js...@us...> - 2012-03-26 15:34:42
|
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 be1abdd92646fc03af296b221b7b32d7214bfc7b (commit)
via 7cfc9e3b8c3fdec2aa7fed7dda3a569e467eb480 (commit)
from 99b1da5d037a7834128262d864cc20a647ff230f (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 be1abdd92646fc03af296b221b7b32d7214bfc7b
Merge: 7cfc9e3 99b1da5
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Mar 26 17:34:07 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 7cfc9e3b8c3fdec2aa7fed7dda3a569e467eb480
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Mar 26 17:33:24 2012 +0200
[BUILDROOT] Add a menu in QtCreator to open a remote console in patch 181.
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/181-qtcreator-add_package.patch | 379 +++++++++++++++++++-
1 files changed, 368 insertions(+), 11 deletions(-)
diff --git a/patches/buildroot/2012.02/181-qtcreator-add_package.patch b/patches/buildroot/2012.02/181-qtcreator-add_package.patch
index 0cec8c2..f4f3bab 100644
--- a/patches/buildroot/2012.02/181-qtcreator-add_package.patch
+++ b/patches/buildroot/2012.02/181-qtcreator-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in.host
===================================================================
---- buildroot.orig/package/Config.in.host 2012-03-23 17:26:40.000000000 +0100
-+++ buildroot/package/Config.in.host 2012-03-23 17:28:35.000000000 +0100
+--- buildroot.orig/package/Config.in.host 2012-02-29 23:19:47.000000000 +0100
++++ buildroot/package/Config.in.host 2012-03-26 16:21:47.000000000 +0200
@@ -3,5 +3,6 @@
source "package/openocd/Config.in.host"
source "package/sam-ba/Config.in.host"
@@ -16,7 +16,7 @@ Index: buildroot/package/Config.in.host
Index: buildroot/package/qtcreator/Config.in.host
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/Config.in.host 2012-03-23 17:28:53.000000000 +0100
++++ buildroot/package/qtcreator/Config.in.host 2012-03-26 16:21:47.000000000 +0200
@@ -0,0 +1,68 @@
+menuconfig BR2_PACKAGE_HOST_QTCREATOR
+ bool "host qtcreator"
@@ -89,7 +89,7 @@ Index: buildroot/package/qtcreator/Config.in.host
Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch 2012-03-26 15:37:29.000000000 +0200
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch 2012-03-26 16:21:47.000000000 +0200
@@ -0,0 +1,52 @@
+Create GDB default server script.
+
@@ -146,7 +146,7 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patc
Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch 2012-03-26 10:44:58.000000000 +0200
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch 2012-03-26 16:21:47.000000000 +0200
@@ -0,0 +1,30 @@
+Create toolchains file with default configuration for Armadeus boards.
+
@@ -181,8 +181,8 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch
Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch 2012-03-26 10:44:58.000000000 +0200
-@@ -0,0 +1,306 @@
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch 2012-03-26 17:01:06.000000000 +0200
+@@ -0,0 +1,308 @@
+Create user settings file with default configuration for Armadeus boards.
+
+Signed-off-by: Jérémie SCHEER <jer...@ar...>
@@ -191,7 +191,7 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.pat
+===================================================================
+--- qtcreator-2.2.1.orig/dev/null 2012-03-15 09:21:31.258893004 +0100
++++ qtcreator-2.2.1/QtCreator.ini 2012-03-15 11:26:23.000000000 +0100
-+@@ -0,0 +1,297 @@
++@@ -0,0 +1,299 @@
++[General]
++DefaultQtVersion=4
++ViewGroup_Default=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5V\0\0\x2\x9c\0\0\0\x4\0\0\0\x4\0\0\0\x1\0\0\0\b\xfc\0\0\0\0)
@@ -366,6 +366,8 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.pat
++LastServerStartScript=SERVER_SCRIPT
++LastUseServerStartScript=USE_GDB_SCRIPT
++LastSysroot=GDB_SYSROOT
+++LastPrivateKeyPath=DEBUG_CONSOLE_KEY_PATH
+++LastRemoteIp=DEBUG_CONSOLE_REMOTE_IP
++
++[FakeVim]
++UseFakeVim=false
@@ -492,7 +494,7 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.pat
Index: buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch 2012-03-26 10:44:58.000000000 +0200
++++ buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch 2012-03-26 16:21:47.000000000 +0200
@@ -0,0 +1,17 @@
+Set QtCreator user settings path to host directory.
+
@@ -514,8 +516,8 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch
Index: buildroot/package/qtcreator/qtcreator.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/qtcreator.mk 2012-03-26 15:35:00.000000000 +0200
-@@ -0,0 +1,126 @@
++++ buildroot/package/qtcreator/qtcreator.mk 2012-03-26 17:16:31.000000000 +0200
+@@ -0,0 +1,130 @@
+#############################################################
+#
+# QtCreator
@@ -558,6 +560,8 @@ Index: buildroot/package/qtcreator/qtcreator.mk
+ $(SED) "s:GDB_SYSROOT:$(TARGET_DIR):" $(@D)/QtCreator.ini
+ $(SED) "s:SERVER_SCRIPT:$(HOST_DIR)/etc/Nokia/gdb_server_script:" $(@D)/QtCreator.ini
+ $(SED) "s:USE_GDB_SCRIPT:true:" $(@D)/QtCreator.ini
++ $(SED) "s:DEBUG_CONSOLE_KEY_PATH:$(HOST_DIR)/etc/ssh/id_dsa:" $(@D)/QtCreator.ini
++ $(SED) "s:DEBUG_CONSOLE_REMOTE_IP:$(BR2_PACKAGE_HOST_QTCREATOR_GDB_SERVER_IP):" $(@D)/QtCreator.ini
+endef
+
+define HOST_QTCREATOR_FILL_GDB_SERVER_SCRIPT
@@ -578,6 +582,8 @@ Index: buildroot/package/qtcreator/qtcreator.mk
+ $(SED) "s:GDB_SYSROOT::" $(@D)/QtCreator.ini
+ $(SED) "s:SERVER_SCRIPT::" $(@D)/QtCreator.ini
+ $(SED) "s:USE_GDB_SCRIPT:false:" $(@D)/QtCreator.ini
++ $(SED) "s:DEBUG_CONSOLE_KEY_PATH::" $(@D)/QtCreator.ini
++ $(SED) "s:DEBUG_CONSOLE_REMOTE_IP::" $(@D)/QtCreator.ini
+endef
+
+define HOST_QTCREATOR_FILL_GDB_SERVER_SCRIPT
@@ -642,3 +648,354 @@ Index: buildroot/package/qtcreator/qtcreator.mk
+
+
+$(eval $(call GENTARGETS,host))
+Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_remote_console_open_menu.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_remote_console_open_menu.patch 2012-03-26 17:25:46.000000000 +0200
+@@ -0,0 +1,346 @@
++Create a new menu in QtCreator to open a remote console.
++
++Signed-off-by: Jérémie SCHEER <jer...@ar...>
++
++Index: qtcreator-2.2.1/src/plugins/debugger/debugger.pro
++===================================================================
++--- qtcreator-2.2.1.orig/src/plugins/debugger/debugger.pro 2012-03-23 18:01:18.000000000 +0100
+++++ qtcreator-2.2.1/src/plugins/debugger/debugger.pro 2012-03-23 14:00:19.000000000 +0100
++@@ -116,7 +116,8 @@
++ commonoptionspage.ui \
++ startexternaldialog.ui \
++ startremotedialog.ui \
++- startremoteenginedialog.ui
+++ startremoteenginedialog.ui \
+++ remoteconsoledialog.ui
++
++ RESOURCES += debugger.qrc
++
++
++Index: qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.cpp
++===================================================================
++--- qtcreator-2.2.1.orig/src/plugins/debugger/debuggerdialogs.cpp 2012-03-23 18:01:33.000000000 +0100
+++++ qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.cpp 2012-03-23 14:38:03.000000000 +0100
++@@ -40,6 +40,7 @@
++ #include "ui_startexternaldialog.h"
++ #include "ui_startremotedialog.h"
++ #include "ui_startremoteenginedialog.h"
+++#include "ui_remoteconsoledialog.h"
++
++ #ifdef Q_OS_WIN
++ # include "shared/dbgwinutils.h"
++@@ -758,6 +759,53 @@
++ m_ui->serverStartScript->setEnabled(enabled);
++ }
++
+++
+++///////////////////////////////////////////////////////////////////////
+++//
+++// RemoteConsoleDialog
+++//
+++///////////////////////////////////////////////////////////////////////
+++
+++RemoteConsoleDialog::RemoteConsoleDialog(QWidget *parent)
+++ : QDialog(parent),
+++ m_ui(new Ui::RemoteConsoleDialog)
+++{
+++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+++ m_ui->setupUi(this);
+++ m_ui->mButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+++ m_ui->mPrivateKeyPathChooser->setExpectedKind(PathChooser::File);
+++ m_ui->mPrivateKeyPathChooser->setPromptDialogTitle(tr("Select Private Key"));
+++
+++ connect(m_ui->mButtonBox, SIGNAL(accepted()), this, SLOT(accept()));
+++ connect(m_ui->mButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
+++}
+++
+++RemoteConsoleDialog::~RemoteConsoleDialog()
+++{
+++ delete m_ui;
+++}
+++
+++void RemoteConsoleDialog::setPrivateKeyPath(const QString &aKeyPath)
+++{
+++ m_ui->mPrivateKeyPathChooser->setPath(aKeyPath);
+++}
+++
+++const QString& RemoteConsoleDialog::privateKeyPath() const
+++{
+++ return m_ui->mPrivateKeyPathChooser->path();
+++}
+++
+++void RemoteConsoleDialog::setRemoteIp(const QString &aRemoteIp)
+++{
+++ m_ui->mRemoteIpLineEdit->setText(aRemoteIp);
+++}
+++
+++const QString& RemoteConsoleDialog::remoteIp() const
+++{
+++ return m_ui->mRemoteIpLineEdit->text();
+++}
+++
+++
++ // --------- StartRemoteCdbDialog
++ static inline QString cdbRemoteHelp()
++ {
++
++Index: qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.h
++===================================================================
++--- qtcreator-2.2.1.orig/src/plugins/debugger/debuggerdialogs.h 2012-03-23 18:01:44.000000000 +0100
+++++ qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.h 2012-03-23 14:34:36.000000000 +0100
++@@ -48,6 +48,7 @@
++ class StartExternalDialog;
++ class StartRemoteDialog;
++ class StartRemoteEngineDialog;
+++class RemoteConsoleDialog;
++ } // namespace Ui
++
++ QT_END_NAMESPACE
++@@ -204,6 +205,24 @@
++ Ui::StartRemoteDialog *m_ui;
++ };
++
+++class RemoteConsoleDialog : public QDialog
+++{
+++ Q_OBJECT
+++
+++public:
+++ explicit RemoteConsoleDialog(QWidget *parent);
+++ ~RemoteConsoleDialog();
+++
+++ const QString& privateKeyPath() const;
+++ void setPrivateKeyPath(const QString &aKeyPath);
+++
+++ const QString& remoteIp() const;
+++ void setRemoteIp(const QString &aRemoteIp);
+++
+++private:
+++ Ui::RemoteConsoleDialog *m_ui;
+++};
+++
++ class StartRemoteCdbDialog : public QDialog
++ {
++ Q_OBJECT
++
++Index: qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.h
++===================================================================
++--- qtcreator-2.2.1.orig/src/plugins/debugger/debuggerplugin.cpp 2012-03-23 18:02:06.000000000 +0100
+++++ qtcreator-2.2.1/src/plugins/debugger/debuggerplugin.cpp 2012-03-23 15:45:36.000000000 +0100
++@@ -111,6 +111,7 @@
++
++ #include <QtCore/QTimer>
++ #include <QtCore/QtPlugin>
+++#include <QtCore/QProcess>
++ #include <QtGui/QComboBox>
++ #include <QtGui/QDockWidget>
++ #include <QtGui/QFileDialog>
++@@ -388,6 +389,7 @@
++ const char * const ADD_TO_WATCH2 = "Debugger.AddToWatch2";
++ const char * const FRAME_UP = "Debugger.FrameUp";
++ const char * const FRAME_DOWN = "Debugger.FrameDown";
+++const char * const REMOTE_CONSOLE = "Debugger.RemoteConsole";
++
++ #ifdef Q_WS_MAC
++ const char * const STOP_KEY = "Shift+Ctrl+Y";
++@@ -404,6 +406,7 @@
++ const char * const BREAK_AT_MAIN_KEY = "Ctrl+D,Ctrl+M";
++ const char * const ADD_TO_WATCH_KEY = "Ctrl+D,Ctrl+W";
++ const char * const SNAPSHOT_KEY = "Ctrl+D,Ctrl+S";
+++const char * const REMOTE_CONSOLE_KEY = "Ctrl+Shift+C";
++ #else
++ const char * const STOP_KEY = "Shift+F5";
++ const char * const RESET_KEY = "Ctrl+Shift+F5";
++@@ -419,6 +422,7 @@
++ const char * const BREAK_AT_MAIN_KEY = "";
++ const char * const ADD_TO_WATCH_KEY = "Ctrl+Alt+Q";
++ const char * const SNAPSHOT_KEY = "Ctrl+D,Ctrl+S";
+++const char * const REMOTE_CONSOLE_KEY = "Ctrl+Shift+C";
++ #endif
++
++ } // namespace Constants
++@@ -931,6 +935,26 @@
++ currentEngine()->frameUp();
++ }
++
+++ void handleRemoteConsole()
+++ {
+++ RemoteConsoleDialog dlg(mainWindow());
+++
+++ dlg.setPrivateKeyPath(configValue(_("LastPrivateKeyPath")).toString());
+++ dlg.setRemoteIp(configValue(_("LastRemoteIp")).toString());
+++
+++ if (dlg.exec() != QDialog::Accepted)
+++ return;
+++
+++ setConfigValue(_("LastPrivateKeyPath"), dlg.privateKeyPath());
+++ setConfigValue(_("LastRemoteIp"), dlg.remoteIp());
+++
+++ QString privateKey = dlg.privateKeyPath();
+++ QString remoteIp = dlg.remoteIp();
+++
+++ QProcess* process = new QProcess;
+++ process->start("xterm", QStringList() << "-e" << "ssh" << "-i" << privateKey << "root@" + remoteIp);
+++ }
+++
++ void handleOperateByInstructionTriggered(bool operateByInstructionTriggered)
++ {
++ // Go to source only if we have the file.
++@@ -1004,6 +1028,7 @@
++ QAction *m_reverseDirectionAction;
++ QAction *m_frameUpAction;
++ QAction *m_frameDownAction;
+++ QAction *m_RemoteConsoleAction;
++
++ QToolButton *m_reverseToolButton;
++
++@@ -1924,6 +1949,8 @@
++ action(ExpandStack)->setEnabled(false);
++
++ m_scriptConsoleWindow->setEnabled(false);
+++
+++ m_RemoteConsoleAction->setEnabled(true);
++ }
++
++ void DebuggerPluginPrivate::updateWatchersWindow()
++@@ -2630,6 +2657,9 @@
++ act = m_frameUpAction = new QAction(tr("Move to Calling Frame"), this);
++ connect(act, SIGNAL(triggered()), SLOT(handleFrameUp()));
++
+++ act = m_RemoteConsoleAction = new QAction(tr("Open Remote Console"), this);
+++ connect(act, SIGNAL(triggered()), SLOT(handleRemoteConsole()));
+++
++ connect(action(OperateByInstruction), SIGNAL(triggered(bool)),
++ SLOT(handleOperateByInstructionTriggered(bool)));
++
++@@ -2904,6 +2934,16 @@
++ //cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+D,Ctrl+W")));
++ debugMenu->addAction(cmd);
++
+++ sep = new QAction(this);
+++ sep->setSeparator(true);
+++ cmd = am->registerAction(sep, _("Debugger.Sep.Console"), globalcontext);
+++ debugMenu->addAction(cmd);
+++
+++ cmd = am->registerAction(m_RemoteConsoleAction,
+++ Constants::REMOTE_CONSOLE, globalcontext);
+++ cmd->setDefaultKeySequence(QKeySequence(Constants::REMOTE_CONSOLE_KEY));
+++ debugMenu->addAction(cmd);
+++
++ // If the CppEditor plugin is there, we want to add something to
++ // the editor context menu.
++ if (ActionContainer *editorContextMenu =
++
++Index: qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.h
++===================================================================
++--- qtcreator-2.2.1.orig/src/plugins/debugger/dev/null 1970-01-01 01:00:00.000000000 +0100
+++++ qtcreator-2.2.1/src/plugins/debugger/remoteconsoledialog.ui 2012-03-23 14:10:40.000000000 +0100
++@@ -0,0 +1,109 @@
+++<?xml version="1.0" encoding="UTF-8"?>
+++<ui version="4.0">
+++ <class>RemoteConsoleDialog</class>
+++ <widget class="QDialog" name="RemoteConsoleDialog">
+++ <property name="geometry">
+++ <rect>
+++ <x>0</x>
+++ <y>0</y>
+++ <width>451</width>
+++ <height>103</height>
+++ </rect>
+++ </property>
+++ <property name="windowTitle">
+++ <string>Dialog</string>
+++ </property>
+++ <layout class="QVBoxLayout" name="verticalLayout">
+++ <item>
+++ <layout class="QFormLayout" name="formLayout">
+++ <property name="fieldGrowthPolicy">
+++ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+++ </property>
+++ <item row="0" column="0">
+++ <widget class="QLabel" name="mPrivateKeyLabel">
+++ <property name="text">
+++ <string>Host private key:</string>
+++ </property>
+++ <property name="buddy">
+++ <cstring>mPrivateKeyPathChooser</cstring>
+++ </property>
+++ </widget>
+++ </item>
+++ <item row="0" column="1">
+++ <widget class="Utils::PathChooser" name="mPrivateKeyPathChooser" native="true"/>
+++ </item>
+++ <item row="1" column="0">
+++ <widget class="QLabel" name="mRemoteIp">
+++ <property name="text">
+++ <string>Remote system IP:</string>
+++ </property>
+++ <property name="buddy">
+++ <cstring>mRemoteIpLineEdit</cstring>
+++ </property>
+++ </widget>
+++ </item>
+++ <item row="1" column="1">
+++ <widget class="QLineEdit" name="mRemoteIpLineEdit">
+++ <property name="text">
+++ <string notr="true"/>
+++ </property>
+++ </widget>
+++ </item>
+++ </layout>
+++ </item>
+++ <item>
+++ <widget class="QDialogButtonBox" name="mButtonBox">
+++ <property name="orientation">
+++ <enum>Qt::Horizontal</enum>
+++ </property>
+++ <property name="standardButtons">
+++ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+++ </property>
+++ </widget>
+++ </item>
+++ </layout>
+++ </widget>
+++ <customwidgets>
+++ <customwidget>
+++ <class>Utils::PathChooser</class>
+++ <extends>QWidget</extends>
+++ <header location="global">utils/pathchooser.h</header>
+++ <container>1</container>
+++ </customwidget>
+++ </customwidgets>
+++ <resources/>
+++ <connections>
+++ <connection>
+++ <sender>mButtonBox</sender>
+++ <signal>accepted()</signal>
+++ <receiver>RemoteConsoleDialog</receiver>
+++ <slot>accept()</slot>
+++ <hints>
+++ <hint type="sourcelabel">
+++ <x>248</x>
+++ <y>254</y>
+++ </hint>
+++ <hint type="destinationlabel">
+++ <x>157</x>
+++ <y>274</y>
+++ </hint>
+++ </hints>
+++ </connection>
+++ <connection>
+++ <sender>mButtonBox</sender>
+++ <signal>rejected()</signal>
+++ <receiver>RemoteConsoleDialog</receiver>
+++ <slot>reject()</slot>
+++ <hints>
+++ <hint type="sourcelabel">
+++ <x>316</x>
+++ <y>260</y>
+++ </hint>
+++ <hint type="destinationlabel">
+++ <x>286</x>
+++ <y>274</y>
+++ </hint>
+++ </hints>
+++ </connection>
+++ </connections>
+++</ui>
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-03-26 15:09: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 99b1da5d037a7834128262d864cc20a647ff230f (commit)
from 48c2ba872e10aa1a1f2e5e2f207092672338a357 (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 99b1da5d037a7834128262d864cc20a647ff230f
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Mar 26 17:08:27 2012 +0200
[BUILDROOT][UCLIBC] Add accept4 define flag in uClibc for Kernel >= 2.6.36 in patch 182.
-----------------------------------------------------------------------
Summary of changes:
.../182-uclibc-add_accept4_declaration_fix.patch | 35 +++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch b/patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch
index 1f97a32..e5bcac0 100644
--- a/patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch
+++ b/patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch
@@ -5,7 +5,7 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch 2012-03-23 16:45:27.000000000 +0100
++++ buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch 2012-03-26 16:34:32.000000000 +0200
@@ -0,0 +1,33 @@
+From db6b038ff049a5b6e11b03d2cdb66248002eafff Mon Sep 17 00:00:00 2001
+From: Guillaume Emont <gui...@ig...>
@@ -40,3 +40,36 @@ Index: buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch
+--
+1.7.4.1
+
+Index: buildroot/toolchain/uClibc/uClibc-0.9.33-assume-accept4-in-recent-arm-kernels.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.33-assume-accept4-in-recent-arm-kernels.patch 2012-03-26 17:04:36.000000000 +0200
+@@ -0,0 +1,28 @@
++From c526492ee2284b6ae61040b2eac5b03120fb3185 Mon Sep 17 00:00:00 2001
++From: Guillaume Emont <gui...@ig...>
++Date: Thu, 15 Sep 2011 20:19:57 +0200
++Subject: [PATCH 2/2] define __ASSUME_ACCEPT4 for arm for kernels >= 2.6.36
++
++---
++ libc/sysdeps/linux/common/bits/kernel-features.h | 5 +++++
++ 1 files changed, 5 insertions(+), 0 deletions(-)
++
++diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h
++index 6bf5544..be92f90 100644
++--- a/libc/sysdeps/linux/common/bits/kernel-features.h
+++++ b/libc/sysdeps/linux/common/bits/kernel-features.h
++@@ -479,6 +479,11 @@
++ # define __ASSUME_ACCEPT4 1
++ #endif
++
+++/* Correct support for the accept4 syscall for arm was added in 2.6.36. */
+++#if __LINUX_KERNEL_VERSION >= 0x020624 && defined __arm__
+++# define __ASSUME_ACCEPT4 1
+++#endif
+++
++ /* Support for the FUTEX_CLOCK_REALTIME flag was added in 2.6.29. */
++ #if __LINUX_KERNEL_VERSION >= 0x02061d
++ # define __ASSUME_FUTEX_CLOCK_REALTIME 1
++--
++1.7.4.1
++
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-03-26 14:10:33
|
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 48c2ba872e10aa1a1f2e5e2f207092672338a357 (commit)
from 1430e6f0968c6b4fd31dbfc67a466e51a45162e1 (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 48c2ba872e10aa1a1f2e5e2f207092672338a357
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Mar 26 16:09:56 2012 +0200
[BUILDROOT][2012.02] Add QtCreator package to Buildroot in patch 181.
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/181-qtcreator-add_package.patch | 644 ++++++++++++++++++++
1 files changed, 644 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/181-qtcreator-add_package.patch
diff --git a/patches/buildroot/2012.02/181-qtcreator-add_package.patch b/patches/buildroot/2012.02/181-qtcreator-add_package.patch
new file mode 100644
index 0000000..0cec8c2
--- /dev/null
+++ b/patches/buildroot/2012.02/181-qtcreator-add_package.patch
@@ -0,0 +1,644 @@
+Add QtCreator package to Buildroot.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/Config.in.host
+===================================================================
+--- buildroot.orig/package/Config.in.host 2012-03-23 17:26:40.000000000 +0100
++++ buildroot/package/Config.in.host 2012-03-23 17:28:35.000000000 +0100
+@@ -3,5 +3,6 @@
+ source "package/openocd/Config.in.host"
+ source "package/sam-ba/Config.in.host"
+ source "package/uboot-tools/Config.in.host"
++source "package/qtcreator/Config.in.host"
+
+ endmenu
+Index: buildroot/package/qtcreator/Config.in.host
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtcreator/Config.in.host 2012-03-23 17:28:53.000000000 +0100
+@@ -0,0 +1,68 @@
++menuconfig BR2_PACKAGE_HOST_QTCREATOR
++ bool "host qtcreator"
++ select BR2_PACKAGE_QT
++ help
++ QtCreator IDE for x86 platform.
++
++ QtCreator binary is installed in
++ $(HOST_DIR)/usr/bin/qtcreator
++
++ http://qt.gitorious.org/qt-creator
++
++if BR2_PACKAGE_HOST_QTCREATOR
++
++menuconfig BR2_PACKAGE_HOST_QTCREATOR_GDB
++ bool "GDB for QtCreator"
++ select BR2_PACKAGE_GDB
++ select BR2_PACKAGE_GDB_SERVER
++ select BR2_PACKAGE_GDB_HOST
++ select BR2_PACKAGE_OPENSSH
++ help
++ Configure QtCreator remote debugger
++
++ All fields must be filled except for the arguments
++ that are optionals.
++
++ A GDB server startup script is generated in
++ $(HOST_DIR)/etc/Nokia/gdb_server_script and
++ can be manually customized or completed.
++
++if BR2_PACKAGE_HOST_QTCREATOR_GDB
++
++config BR2_PACKAGE_HOST_QTCREATOR_GDB_SERVER_IP
++ string "GDB server IP address"
++ default "192.168.0.208"
++ help
++ Can be changed directly in QtCreator remote GDB interface.
++
++config BR2_PACKAGE_HOST_QTCREATOR_GDB_SERVER_PORT
++ string "GDB server port"
++ default "5600"
++ help
++ Can be changed directly in QtCreator remote GDB interface.
++
++config BR2_PACKAGE_HOST_QTCREATOR_GDB_LOCAL_EXECUTABLE
++ string "Local executable path"
++ help
++ Path to the local executable.
++ Can be changed in QtCreator remote GDB interface and in GDB server
++ startup script (buildroot/output/host/etc/gdb_server_startup)
++
++config BR2_PACKAGE_HOST_QTCREATOR_GDB_REMOTE_EXECUTABLE
++ string "Remote executable path on system"
++ help
++ Remote path to the executable on the remote system.
++ Can be changed in GDB server startup script (buildroot/output/
++ host/etc/gdb_server_startup)
++
++config BR2_PACKAGE_HOST_QTCREATOR_GDB_REMOTE_EXEC_ARGUMENTS
++ string "Remote executable arguments"
++ help
++ List of optional arguments for remote executable.
++ Can be changed in GDB server startup script (buildroot/output/
++ host/etc/gdb_server_startup)
++
++endif # BR2_PACKAGE_HOST_QTCREATOR_GDB
++
++endif # BR2_PACKAGE_HOST_QTCREATOR
++
+Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch 2012-03-26 15:37:29.000000000 +0200
+@@ -0,0 +1,52 @@
++Create GDB default server script.
++
++Signed-off-by: Jérémie SCHEER <jer...@ar...>
++
++Index: qtcreator-2.2.1/gdb_server_script
++===================================================================
++--- qtcreator-2.2.1.orig/dev/null 2012-03-15 09:21:31.258893004 +0100
+++++ qtcreator-2.2.1/gdb_server_script 2012-03-19 14:24:44.000000000 +0100
++@@ -0,0 +1,43 @@
+++#
+++# This software has been developed by ARMADEUS SYSTEMS
+++#
+++# Copyright (C) 2012
+++#
+++# Author: Jérémie SCHEER
+++#
+++# Project Name: THE ARMADEUS PROJECT
+++#
+++# Sub-Project Name:
+++#
+++# Written by: The armadeus systems team
+++#
+++# This program is free software; you can redistribute it and/or modify
+++# it under the terms of the GNU General Public License as published by
+++# the Free Software Foundation; either version 2 of the License, or
+++# (at your option) any later version.
+++#
+++# This program is distributed in the hope that it will be useful,
+++# but WITHOUT ANY WARRANTY; without even the implied warranty of
+++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+++# GNU General Public License for more details.
+++#
+++# You should have received a copy of the GNU General Public License
+++# along with this program; if not, write to the Free Software
+++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+++#
+++
+++IP_ADDR=DEFAULT_IP
+++PORT=DEFAULT_PORT
+++EXEC_ARGUMENTS=DEFAULT_ARGUMENTS
+++PRIVATE_KEY_PATH=DEFAULT_KEY_PATH
+++
+++# Copy executable to embedded system
+++# Use the same command if you must copy other files
+++# to the remote environment
+++LOCAL_EXEC_PATH=DEFAULT_LOCAL_PATH
+++REMOTE_EXEC_PATH=DEFAULT_REMOTE_PATH
+++
+++scp -i $PRIVATE_KEY_PATH $LOCAL_EXEC_PATH root@${IP_ADDR}:$REMOTE_EXEC_PATH 2>/dev/null
+++
+++# Launch remote GDB server
+++ssh -i $PRIVATE_KEY_PATH -t root@${IP_ADDR} /usr/bin/gdbserver ${IP_ADDR}:${PORT} $REMOTE_EXEC_PATH ${EXEC_ARGUMENTS} 2>/dev/null&
+Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch 2012-03-26 10:44:58.000000000 +0200
+@@ -0,0 +1,30 @@
++Create toolchains file with default configuration for Armadeus boards.
++
++Signed-off-by: Jérémie SCHEER <jer...@ar...>
++
++Index: qtcreator-2.2.1/toolChains.xml
++===================================================================
++--- qtcreator-2.2.1.orig/dev/null 2012-03-12 09:20:30.508028007 +0100
+++++ qtcreator-2.2.1/toolChains.xml 2012-03-12 11:53:41.000000000 +0100
++@@ -0,0 +1,21 @@
+++<!DOCTYPE QtCreatorToolChains>
+++<qtcreator>
+++ <data>
+++ <variable>ToolChain.0</variable>
+++ <valuemap type="QVariantMap">
+++ <value key="ProjectExplorer.GccToolChain.Debugger" type="QString"></value>
+++ <value key="ProjectExplorer.GccToolChain.Path" type="QString">TOOLCHAIN_PATH</value>
+++ <value key="ProjectExplorer.GccToolChain.TargetAbi" type="QString">TOOLCHAIN_TARGET_ABI</value>
+++ <value key="ProjectExplorer.ToolChain.DisplayName" type="QString">TOOLCHAIN_NAME</value>
+++ <value key="ProjectExplorer.ToolChain.Id" type="QString">ProjectExplorer.ToolChain.Gcc:TOOLCHAIN_ID.</value>
+++ </valuemap>
+++ </data>
+++ <data>
+++ <variable>ToolChain.Count</variable>
+++ <value type="int">1</value>
+++ </data>
+++ <data>
+++ <variable>Version</variable>
+++ <value type="int">1</value>
+++ </data>
+++</qtcreator>
+Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch 2012-03-26 10:44:58.000000000 +0200
+@@ -0,0 +1,306 @@
++Create user settings file with default configuration for Armadeus boards.
++
++Signed-off-by: Jérémie SCHEER <jer...@ar...>
++
++Index: qtcreator-2.2.1/QtCreator.ini
++===================================================================
++--- qtcreator-2.2.1.orig/dev/null 2012-03-15 09:21:31.258893004 +0100
+++++ qtcreator-2.2.1/QtCreator.ini 2012-03-15 11:26:23.000000000 +0100
++@@ -0,0 +1,297 @@
+++[General]
+++DefaultQtVersion=4
+++ViewGroup_Default=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5V\0\0\x2\x9c\0\0\0\x4\0\0\0\x4\0\0\0\x1\0\0\0\b\xfc\0\0\0\0)
+++ProjectTreeWidget.0.ProjectFilter=false
+++ProjectTreeWidget.0.GeneratedFilter=true
+++ProjectTreeWidget.0.SyncWithEditor=true
+++DesignerdefaultGrid=@Variant(\0\0\0\b\0\0\0\0)
+++DesignerzoomEnabled=false
+++Designerzoom=100
+++DesignerActionEditorViewMode=0
+++DesignerFormTemplate=Dialog without Buttons
+++DesignerNewFormSize=@Size(320 240)
+++Outline.0.SyncWithEditor=true
+++Outline.1.SyncWithEditor=true
+++ProjectTreeWidget.1.ProjectFilter=false
+++ProjectTreeWidget.1.GeneratedFilter=true
+++ProjectTreeWidget.1.SyncWithEditor=true
+++
+++[QtVersions]
+++1\Name=Qt Embedded (arm)
+++1\Path=QT_EMBEDDED_PATH
+++1\QMakePath=QT_EMBEDDED_QMAKE_PATH
+++1\Id=
+++1\msvcVersion=
+++1\isAutodetected=false
+++1\S60SDKDirectory=
+++1\SBSv2Directory=
+++size=1
+++
+++[Navigation]
+++Version=2
+++Views=Projects, Open Documents
+++Visible=true
+++VerticalPosition=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x2\0\0\x1\xcb\0\0\0\xd8\0\0\0\0\x1\x1\0\0\0\x2)
+++Width=347
+++
+++[ProjectExplorer]
+++StartupSession=
+++RecentProjects\FileNames=@Invalid()
+++RecentProjects\DisplayNames=@Invalid()
+++Settings\BuildBeforeRun=true
+++Settings\SaveBeforeBuild=true
+++Settings\ShowCompilerOutput=false
+++Settings\UseJom=true
+++Settings\CleanOldAppOutput=false
+++Settings\BuildBeforeDeploy=true
+++Settings\DeployBeforeRun=true
+++Settings\WrapAppOutput=true
+++Settings\AutoRestoreLastSession=false
+++Settings\EnvironmentId=
+++Settings\ShowRunOutput=true
+++Settings\PromptToStopRunControl=false
+++
+++[MainWindow]
+++Color=@Variant(\0\0\0\x43\x1\xff\xff\x66\x66\x66\x66\x66\x66\0\0)
+++WindowGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\a\x80\0\0\x1P\0\0\f\xd5\0\0\x4\x1f\0\0\a\x80\0\0\x1L\0\0\v\x7f\0\0\x4\t\0\0\0\x1\x2\0)
+++WindowState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5V\0\0\x2\x99\0\0\0\x4\0\0\0\x4\0\0\0\x1\0\0\0\b\xfc\0\0\0\0)
+++
+++[RecentFiles]
+++Files=@Invalid()
+++EditorIds=@Invalid()
+++
+++[KeyBindings]
+++size=0
+++
+++[Find]
+++Backward=false
+++CaseSensitively=false
+++WholeWords=false
+++FindStrings=@Invalid()
+++ReplaceStrings=@Invalid()
+++FindToolBar\Backward=false
+++FindToolBar\CaseSensitively=false
+++FindToolBar\WholeWords=false
+++FindToolBar\RegularExpression=false
+++CurrentFilter=Current Project
+++AllProjectsFind\filters=*
+++AllProjectsFind\currentFilter=*
+++AllProjectsFind\useRegExp=false
+++CurrentProjectFind\filters=*
+++CurrentProjectFind\currentFilter=*
+++CurrentProjectFind\useRegExp=false
+++FindInFiles\filters="*.cpp,*.h"
+++FindInFiles\currentFilter="*.cpp,*.h"
+++FindInFiles\useRegExp=false
+++FindInFiles\directories=
+++FindInFiles\currentDirectory=
+++FindInCurrentFile\filters="*.cpp,*.h"
+++FindInCurrentFile\useRegExp=false
+++RegularExpression=false
+++CppSymbols\SymbolsToSearchFor=15
+++CppSymbols\SearchScope=0
+++
+++[CppTools]
+++Completion\CaseSensitive=true
+++Completion\AutoInsertBraces=true
+++Completion\PartiallyComplete=true
+++SortedMethodOverview=false
+++
+++[DebugMode]
+++UseAlternatingRowColours=false
+++UseMessageBoxForSignals=true
+++AutoQuit=false
+++LogTimeStamps=false
+++UseDebuggingHelper=true
+++UseCustomDebuggingHelperLocation=false
+++CustomDebuggingHelperLocation=
+++DebugDebuggingHelpers=false
+++UseCodeModel=true
+++UseToolTips=false
+++UseToolTipsInLocalsView=false
+++UseToolTipsInBreakpointsView=false
+++UseAddressInBreakpointsView=false
+++UseAddressInStackView=false
+++Location=gdb
+++Environment=
+++ScriptFile=
+++WatchdogTimeout=40
+++MaximalStackDepth=20
+++ListSourceFiles=false
+++SkipKnownFrames=false
+++EnableReverseDebugging=false
+++AllPluginBreakpoints=true
+++SelectedPluginBreakpoints=false
+++NoPluginBreakpoints=false
+++SelectedPluginBreakpointsPattern=.*
+++UsePreciseBreakpoints=true
+++Stack=false
+++Breakpoints=false
+++Locals%20and%20Watchers=false
+++Registers=false
+++Locked=true
+++Thread=false
+++Source%20Files=false
+++Modules=false
+++Debugger=false
+++VerboseLog=false
+++ShowStandardNamespace=true
+++ShowQtNamespace=true
+++BreakOnThrow=false
+++BreakOnCatch=false
+++ChangeLanguageAutomatically=true
+++CppDebugThreadsDockWidget=true
+++CppDebugLocalsAndWatchersDockWidget=false
+++CppDebugOutputDockWidget=false
+++CppDebugSourcesDockWidget=false
+++CppDebugBreakpointsDockWidget=false
+++CppDebugRegistersDockWidget=false
+++CppDebugSnapshotsDockWidget=false
+++CppDebugStackDockWidget=false
+++CppDebugModulesDockWidget=false
+++CloseBuffersOnExit=false
+++SwitchModeOnExit=false
+++SortStructMembers=true
+++AutoDerefPointers=true
+++AdjustBreakpointLocations=true
+++ShowThreadNames=false
+++LoadGdbInit=true
+++TargetAsync=false
+++AlwaysAdjustStackColumnWidths=false
+++AlwaysAdjustLocalsColumnWidths=false
+++AlwaysAdjustBreakpointsColumnWidths=false
+++AlwaysAdjustRegistersColumnWidths=false
+++AlwaysAdjustSnapshotsColumnWidths=false
+++AlwaysAdjustThreadsColumnWidths=false
+++AlwaysAdjustModulesColumnWidths=false
+++LastRemoteChannel=GDB_REMOTE_SERVER
+++LastLocalExecutable=GDB_DEBUGGED_PROGRAM
+++LastDebugger=GDB_BINARY
+++LastRemoteArchitecture=arm
+++LastGnuTarget=arm-none-linux-gnueabi
+++LastServerStartScript=SERVER_SCRIPT
+++LastUseServerStartScript=USE_GDB_SCRIPT
+++LastSysroot=GDB_SYSROOT
+++
+++[FakeVim]
+++UseFakeVim=false
+++StartOfLine=false
+++HlSearch=true
+++TabStop=8
+++SmartTab=false
+++ShiftWidth=8
+++ExpandTab=false
+++AutoIndent=false
+++IncSearch=true
+++Backspace="indent,eol,start"
+++ReadVimRc=false
+++SmartIndent=false
+++UseCoreSearch=false
+++IsKeyword="@@,48-57,_,192-255,a-z,A-Z"
+++ShowMarks=false
+++PassControlKey=false
+++
+++[HelpSideBar]
+++Views=Index
+++Visible=true
+++VerticalPosition=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\xd2\0\0\0\0\x1\x1\0\0\0\x2)
+++Width=300
+++
+++[%General]
+++WelcomeTab=1
+++LastPreferenceCategory=L.Qt4
+++LastPreferencePage=Qt Versions
+++TerminalEmulator=xterm -e
+++
+++[SearchResults]
+++ExpandResults=true
+++
+++[DesignerPreview]
+++Enabled=false
+++Style=
+++AppStyleSheet=
+++Skin=
+++UserDeviceSkins=@Invalid()
+++
+++[CodePasterSettings]
+++Server=
+++
+++[PasteBinDotComSettings]
+++Prefix=
+++
+++[TextEditor]
+++FontSize=9
+++ColorScheme=COLOR_SCHEMES
+++FontZoom=100
+++
+++[Directories]
+++Projects=
+++UseProjectsDirectory=false
+++
+++[FakeVimExCommand]
+++size=0
+++
+++[DebugMode.CppMode]
+++Debugger.Docks.Modules=false
+++Debugger.Docks.Threads=false
+++Debugger.Docks.Stack=false
+++Debugger.Docks.ScriptConsole=false
+++Locked=true
+++Debugger.Docks.Register=false
+++Debugger.Docks.Output=false
+++Debugger.Docks.Snapshots=false
+++Debugger.Docks.Break=false
+++Debugger.Docks.SourceFiles=false
+++Debugger.Docks.LocalsAndWatchers=false
+++Debugger.Docks.QmlInspector=false
+++Debugger%20Toolbar=false
+++
+++[DebugMode.CppQmlMode]
+++Debugger.Docks.Modules=false
+++Debugger.Docks.Threads=false
+++Debugger.Docks.Stack=false
+++Debugger.Docks.ScriptConsole=false
+++Locked=true
+++Debugger.Docks.Register=false
+++Debugger.Docks.Output=false
+++Debugger.Docks.Snapshots=false
+++Debugger.Docks.Break=false
+++Debugger.Docks.SourceFiles=false
+++Debugger.Docks.LocalsAndWatchers=false
+++Debugger.Docks.QmlInspector=false
+++
+++[QML.Inspector]
+++ShowLivePreview=true
+++
+++[VCS]
+++NickNameMailMap=
+++NickNameFieldListFile=
+++SubmitMessageCheckScript=
+++LineWrap=true
+++LineWrapWidth=72
+++SshPasswordPrompt=/usr/bin/ssh-askpass
+++
+++[TextHighlighterSettings]
+++UserDefinitionFilesPath=GENERIC_HIGHLIGHTER
+++AlertWhenDefinitionsIsNotFound=true
+++UseFallbackLocation=true
+++IgnoredFilesPatterns="*.txt,LICENSE*,README,INSTALL,COPYING,NEWS,qmldir,*.lst"
+++
+++[ClassView]
+++TreeWidget.0\FlatMode=false
+++TreeWidget.1\FlatMode=false
+++
+++[Plugins]
+++Ignored=@Invalid()
+++ForceEnabled=@Invalid()
+++
+++[CMakeSettings]
+++cmakeExecutable=
+++
+++[ExternalTools]
+++OverrideCategories\Linguist\size=2
+++OverrideCategories\Linguist\1\Tool=lupdate
+++OverrideCategories\Linguist\2\Tool=lrelease
+++OverrideCategories\Text\size=2
+++OverrideCategories\Text\1\Tool=sort
+++OverrideCategories\Text\2\Tool=vi
+Index: buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch 2012-03-26 10:44:58.000000000 +0200
+@@ -0,0 +1,17 @@
++Set QtCreator user settings path to host directory.
++
++Signed-off-by: Jérémie SCHEER <jer...@ar...>
++
++Index: qtcreator-2.2.1/src/app/main.cpp
++===================================================================
++--- qtcreator-2.2.1.orig/src/app/main.cpp 2012-03-09 11:56:13.000000000 +0100
+++++ qtcreator-2.2.1/src/app/main.cpp 2012-03-09 12:02:29.000000000 +0100
++@@ -221,6 +221,8 @@
++ }
++ if (!settingsPath.isEmpty())
++ QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, settingsPath);
+++ else
+++ QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, "HOST_DIR/etc");
++
++ // Must be done before any QSettings class is created
++ QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope,
+Index: buildroot/package/qtcreator/qtcreator.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtcreator/qtcreator.mk 2012-03-26 15:35:00.000000000 +0200
+@@ -0,0 +1,126 @@
++#############################################################
++#
++# QtCreator
++#
++#############################################################
++QTCREATOR_VERSION_MAJOR = 2.2
++QTCREATOR_VERSION = $(QTCREATOR_VERSION_MAJOR).1
++QTCREATOR_SOURCE = qt-creator-$(QTCREATOR_VERSION)-src.tar.gz
++QTCREATOR_SITE = ftp://ftp.qt.nokia.com/qtcreator/
++
++TOOLCHAIN_ABI = arm-linux-generic-elf-32bit
++TOOLCHAIN_NAME = arm-linux-g++
++
++HOST_QTCREATOR_DEPENDENCIES = openssh
++
++define HOST_QTCREATOR_SET_SETTINGS_PATH
++ $(SED) "s:HOST_DIR:$(HOST_DIR):" $(@D)/src/app/main.cpp
++endef
++
++define HOST_QTCREATOR_SET_SETTINGS_DEFAULT_CONFIG
++ $(SED) "s:QT_EMBEDDED_PATH:$(STAGING_DIR)/usr:" $(@D)/QtCreator.ini
++ $(SED) "s:QT_EMBEDDED_QMAKE_PATH:$(HOST_DIR)/usr/bin/qmake:" $(@D)/QtCreator.ini
++ $(SED) "s:COLOR_SCHEMES:$(HOST_DIR)/usr/share/qtcreator/styles/default.xml:" $(@D)/QtCreator.ini
++ $(SED) "s:GENERIC_HIGHLIGHTER:$(HOST_DIR)/etc/Nokia/qtcreator/generic-highlighter:" $(@D)/QtCreator.ini
++endef
++
++define HOST_QTCREATOR_SET_TOOLCHAINS_DEFAULT_CONFIG
++ $(SED) "s:TOOLCHAIN_PATH:$(HOST_DIR)/usr/bin/$(TOOLCHAIN_NAME):" $(@D)/toolChains.xml
++ $(SED) "s:TOOLCHAIN_TARGET_ABI:$(TOOLCHAIN_ABI):" $(@D)/toolChains.xml
++ $(SED) "s:TOOLCHAIN_NAME:$(TOOLCHAIN_NAME):" $(@D)/toolChains.xml
++ $(SED) "s:TOOLCHAIN_ID:$(HOST_DIR)/usr/bin/$(TOOLCHAIN_NAME).$(TOOLCHAIN_ABI):" $(@D)/toolChains.xml
++endef
++
++ifeq ($(BR2_PACKAGE_HOST_QTCREATOR_GDB),y)
++
++define HOST_QTCREATOR_SET_GDB_DEFAULT_CONFIG
++ $(SED) "s:GDB_REMOTE_SERVER:$(BR2_PACKAGE_HOST_QTCREATOR_GDB_SERVER_IP)\:$(BR2_PACKAGE_HOST_QTCREATOR_GDB_SERVER_PORT):" $(@D)/QtCreator.ini
++ $(SED) "s:GDB_DEBUGGED_PROGRAM:$(BR2_PACKAGE_HOST_QTCREATOR_GDB_LOCAL_EXECUTABLE):" $(@D)/QtCreator.ini
++ $(SED) "s:GDB_BINARY:$(HOST_DIR)/usr/bin/arm-linux-gdb:" $(@D)/QtCreator.ini
++ $(SED) "s:GDB_SYSROOT:$(TARGET_DIR):" $(@D)/QtCreator.ini
++ $(SED) "s:SERVER_SCRIPT:$(HOST_DIR)/etc/Nokia/gdb_server_script:" $(@D)/QtCreator.ini
++ $(SED) "s:USE_GDB_SCRIPT:true:" $(@D)/QtCreator.ini
++endef
++
++define HOST_QTCREATOR_FILL_GDB_SERVER_SCRIPT
++ $(SED) "s:DEFAULT_IP:$(BR2_PACKAGE_HOST_QTCREATOR_GDB_SERVER_IP):" $(@D)/gdb_server_script
++ $(SED) "s:DEFAULT_PORT:$(BR2_PACKAGE_HOST_QTCREATOR_GDB_SERVER_PORT):" $(@D)/gdb_server_script
++ $(SED) "s:DEFAULT_ARGUMENTS:$(BR2_PACKAGE_HOST_QTCREATOR_GDB_REMOTE_EXEC_ARGUMENTS):" $(@D)/gdb_server_script
++ $(SED) "s:DEFAULT_LOCAL_PATH:$(BR2_PACKAGE_HOST_QTCREATOR_GDB_LOCAL_EXECUTABLE):" $(@D)/gdb_server_script
++ $(SED) "s:DEFAULT_REMOTE_PATH:$(BR2_PACKAGE_HOST_QTCREATOR_GDB_REMOTE_EXECUTABLE):" $(@D)/gdb_server_script
++ $(SED) "s:DEFAULT_KEY_PATH:$(HOST_DIR)/etc/ssh/id_dsa:" $(@D)/gdb_server_script
++endef
++
++else
++
++define HOST_QTCREATOR_SET_GDB_DEFAULT_CONFIG
++ $(SED) "s:GDB_REMOTE_SERVER::" $(@D)/QtCreator.ini
++ $(SED) "s:GDB_DEBUGGED_PROGRAM::" $(@D)/QtCreator.ini
++ $(SED) "s:GDB_BINARY::" $(@D)/QtCreator.ini
++ $(SED) "s:GDB_SYSROOT::" $(@D)/QtCreator.ini
++ $(SED) "s:SERVER_SCRIPT::" $(@D)/QtCreator.ini
++ $(SED) "s:USE_GDB_SCRIPT:false:" $(@D)/QtCreator.ini
++endef
++
++define HOST_QTCREATOR_FILL_GDB_SERVER_SCRIPT
++ $(SED) "s:DEFAULT_IP::" $(@D)/gdb_server_script
++ $(SED) "s:DEFAULT_PORT::" $(@D)/gdb_server_script
++ $(SED) "s:DEFAULT_ARGUMENTS::" $(@D)/gdb_server_script
++ $(SED) "s:DEFAULT_LOCAL_PATH::" $(@D)/gdb_server_script
++ $(SED) "s:DEFAULT_REMOTE_PATH::" $(@D)/gdb_server_script
++ $(SED) "s:DEFAULT_KEY_PATH::" $(@D)/gdb_server_script
++endef
++
++endif
++
++HOST_QTCREATOR_POST_PATCH_HOOKS += HOST_QTCREATOR_SET_SETTINGS_PATH
++HOST_QTCREATOR_POST_PATCH_HOOKS += HOST_QTCREATOR_SET_SETTINGS_DEFAULT_CONFIG
++HOST_QTCREATOR_POST_PATCH_HOOKS += HOST_QTCREATOR_SET_TOOLCHAINS_DEFAULT_CONFIG
++HOST_QTCREATOR_POST_PATCH_HOOKS += HOST_QTCREATOR_SET_GDB_DEFAULT_CONFIG
++HOST_QTCREATOR_POST_PATCH_HOOKS += HOST_QTCREATOR_FILL_GDB_SERVER_SCRIPT
++
++define HOST_QTCREATOR_CONFIGURE_CMDS
++ (cd $(@D); \
++ if [ "`which qmake`" != "" ]; then \
++ `which qmake` qtcreator.pro; \
++ fi \
++ )
++endef
++
++HOST_QTCREATOR_MAKE_ENV = \
++ QTCREATOR_MODULES_INCLUDE=/usr/include \
++ QTCREATOR_MODULES_LIB="/lib /usr/lib"
++
++define HOST_QTCREATOR_INSTALL_CMDS
++ (cd $(@D); make install INSTALL_ROOT=$(HOST_DIR)/usr)
++endef
++
++define HOST_QTCREATOR_INSTALL_SETTINGS_FILES
++ mkdir -p $(HOST_DIR)/etc/Nokia
++ cp $(@D)/QtCreator.ini $(HOST_DIR)/etc/Nokia
++ cp $(@D)/toolChains.xml $(HOST_DIR)/etc/Nokia
++endef
++
++define HOST_QTCREATOR_INSTALL_SSH_KEYS
++ mkdir $(HOST_DIR)/etc/ssh
++ ssh-keygen -f $(HOST_DIR)/etc/ssh/id_dsa -t dsa -b 1024 -N ""
++
++ mkdir $(TARGET_DIR)/root/.ssh/
++ touch $(TARGET_DIR)/root/.ssh/authorized_keys
++ cat $(HOST_DIR)/etc/ssh/id_dsa.pub > $(TARGET_DIR)/root/.ssh/authorized_keys
++endef
++
++define HOST_QTCREATOR_INSTALL_GDB_SERVER_SCRIPT
++ mkdir -p $(HOST_DIR)/etc/Nokia
++ cp $(@D)/gdb_server_script $(HOST_DIR)/etc/Nokia
++ chmod a+x $(HOST_DIR)/etc/Nokia/gdb_server_script
++endef
++
++HOST_QTCREATOR_POST_INSTALL_HOOKS += HOST_QTCREATOR_INSTALL_SETTINGS_FILES
++ifeq ($(BR2_PACKAGE_HOST_QTCREATOR_GDB),y)
++ HOST_QTCREATOR_POST_INSTALL_HOOKS += HOST_QTCREATOR_INSTALL_SSH_KEYS
++ HOST_QTCREATOR_POST_INSTALL_HOOKS += HOST_QTCREATOR_INSTALL_GDB_SERVER_SCRIPT
++endif
++
++
++$(eval $(call GENTARGETS,host))
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-03-23 16:11:12
|
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 1430e6f0968c6b4fd31dbfc67a466e51a45162e1 (commit)
from 528a49030d4209b73db1c2147c0b7247edf306af (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 1430e6f0968c6b4fd31dbfc67a466e51a45162e1
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Mar 23 17:10:39 2012 +0100
[BUILDROOT][UCLIBC] Patch 182 for uClibc 0.9.33 to remove accept4 declaration if not available in Linux Kernel.
[BUILDROOT][UCLIBC] Change patch 047 to make uClibc 0.9.33 the Buildroot's default version.
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2012.02/047-uclibc-config.patch | 21 +++++++++-
.../182-uclibc-add_accept4_declaration_fix.patch | 42 ++++++++++++++++++++
2 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch
diff --git a/patches/buildroot/2012.02/047-uclibc-config.patch b/patches/buildroot/2012.02/047-uclibc-config.patch
index 2fcd115..d970155 100644
--- a/patches/buildroot/2012.02/047-uclibc-config.patch
+++ b/patches/buildroot/2012.02/047-uclibc-config.patch
@@ -1,7 +1,11 @@
+Make uClibc 0.9.33 as Buildroot's default version
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
Index: buildroot/toolchain/uClibc/uclibc.mk
===================================================================
---- buildroot.orig/toolchain/uClibc/uclibc.mk 2012-02-21 16:43:28.000000000 +0100
-+++ buildroot/toolchain/uClibc/uclibc.mk 2012-02-21 16:44:22.000000000 +0100
+--- buildroot.orig/toolchain/uClibc/uclibc.mk 2012-02-29 23:19:47.000000000 +0100
++++ buildroot/toolchain/uClibc/uclibc.mk 2012-03-23 16:57:54.000000000 +0100
@@ -102,23 +102,6 @@
-e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
$(UCLIBC_DIR)/.oldconfig
@@ -26,3 +30,16 @@ Index: buildroot/toolchain/uClibc/uclibc.mk
$(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \
$(UCLIBC_DIR)/.oldconfig
$(SED) 's/^.*$(UCLIBC_ARM_TYPE).*/$(UCLIBC_ARM_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig
+Index: buildroot/toolchain/uClibc/Config.in
+===================================================================
+--- buildroot.orig/toolchain/uClibc/Config.in 2012-03-23 17:04:18.000000000 +0100
++++ buildroot/toolchain/uClibc/Config.in 2012-03-23 17:04:28.000000000 +0100
+@@ -6,7 +6,7 @@
+ choice
+ prompt "uClibc C library Version"
+ default BR2_UCLIBC_VERSION_0_9_31 if (BR2_avr32 || BR2_sh) # 0.9.32 broken
+- default BR2_UCLIBC_VERSION_0_9_32
++ default BR2_UCLIBC_VERSION_0_9_33
+ help
+ Select the version of uClibc you wish to use.
+
diff --git a/patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch b/patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch
new file mode 100644
index 0000000..1f97a32
--- /dev/null
+++ b/patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch
@@ -0,0 +1,42 @@
+Fix accept4 declaration in uClibc when not available in Linux Kernel.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch 2012-03-23 16:45:27.000000000 +0100
+@@ -0,0 +1,33 @@
++From db6b038ff049a5b6e11b03d2cdb66248002eafff Mon Sep 17 00:00:00 2001
++From: Guillaume Emont <gui...@ig...>
++Date: Thu, 15 Sep 2011 20:19:19 +0200
++Subject: [PATCH 1/2] Only expose accept4 in headers if it is available
++
++---
++ include/sys/socket.h | 3 ++-
++ 1 files changed, 2 insertions(+), 1 deletions(-)
++
++diff --git a/include/sys/socket.h b/include/sys/socket.h
++index 6037f92..53b56ea 100644
++--- a/include/sys/socket.h
+++++ b/include/sys/socket.h
++@@ -22,6 +22,7 @@
++ #define _SYS_SOCKET_H 1
++
++ #include <features.h>
+++#include <bits/kernel-features.h>
++
++ __BEGIN_DECLS
++
++@@ -227,7 +228,7 @@ extern int accept (int __fd, __SOCKADDR_ARG __addr,
++ socklen_t *__restrict __addr_len);
++ libc_hidden_proto(accept)
++
++-#if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU
+++#if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU && defined __ASSUME_ACCEPT4
++ /* Similar to 'accept' but takes an additional parameter to specify flags.
++
++ This function is a cancellation point and therefore not marked with
++--
++1.7.4.1
++
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-21 23:39:47
|
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 528a49030d4209b73db1c2147c0b7247edf306af (commit)
from 590d54031cc57967128bf55dfa023b7105efc974 (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 528a49030d4209b73db1c2147c0b7247edf306af
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 22 00:25:15 2012 +0100
[TOOLS] apf51: update and improve U-Boot recover tool
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf51-u-boot.bin | Bin 255824 -> 237920 bytes
software/uboot_recover/apf51_recover.py | 6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/software/uboot_recover/apf51-u-boot.bin b/software/uboot_recover/apf51-u-boot.bin
index ef3777b..6f5b307 100644
Binary files a/software/uboot_recover/apf51-u-boot.bin and b/software/uboot_recover/apf51-u-boot.bin differ
diff --git a/software/uboot_recover/apf51_recover.py b/software/uboot_recover/apf51_recover.py
index 85778b4..bdcdc29 100644
--- a/software/uboot_recover/apf51_recover.py
+++ b/software/uboot_recover/apf51_recover.py
@@ -425,7 +425,7 @@ class UBoot:
return response
def resetEnv(self):
- self.serial.flushInput()
+ self.serial.flushInput()
self.serial.write("run flash_reset_env\n")
return self.__getOutput()
@@ -437,7 +437,7 @@ class UBoot:
def flash(self):
""" Ask U-Boot to flash itself """
- self.serial.flushInput()
+ self.serial.flushInput()
self.serial.write("run flash_uboot\n")
try:
ret = self.__getOutput()
@@ -540,7 +540,7 @@ if __name__ == "__main__":
ser = serial.Serial(port, SPEED, timeout=2)
except Exception, msg:
print "unable to open serial port %s !" % port
- print msg
+ print msg
sys.exit()
ser.flush()
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-21 22:06: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 590d54031cc57967128bf55dfa023b7105efc974 (commit)
via 584278a6b89644a88a8b279389a22f093dd06a41 (commit)
from a58152c247e41d10d376bb0928e7d2b3f9279367 (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 590d54031cc57967128bf55dfa023b7105efc974
Merge: 584278a a58152c
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 21 23:17:27 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 584278a6b89644a88a8b279389a22f093dd06a41
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 21 23:16:39 2012 +0100
[UBOOT] apf27: add nand lock/unlock command
-----------------------------------------------------------------------
Summary of changes:
.../311-imx-nand-lock-unlock.patch} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
copy patches/u-boot/{2010.03/u-boot-2010.03-311-imx-nand-lock-unlock.patch => 2011.12/311-imx-nand-lock-unlock.patch} (93%)
diff --git a/patches/u-boot/2010.03/u-boot-2010.03-311-imx-nand-lock-unlock.patch b/patches/u-boot/2011.12/311-imx-nand-lock-unlock.patch
similarity index 93%
copy from patches/u-boot/2010.03/u-boot-2010.03-311-imx-nand-lock-unlock.patch
copy to patches/u-boot/2011.12/311-imx-nand-lock-unlock.patch
index 9306d8c..bce4dd1 100644
--- a/patches/u-boot/2010.03/u-boot-2010.03-311-imx-nand-lock-unlock.patch
+++ b/patches/u-boot/2011.12/311-imx-nand-lock-unlock.patch
@@ -71,11 +71,11 @@ Index: u-boot-2010.03/drivers/mtd/nand/mxc_nand.c
+ && !(readw(&host->regs->nfc_nf_wrprst) & NFC_WRPR_LTS)
+ && ((readw(&host->regs->nfc_unlockend_blkaddr) >= page_addr>>6)
+ && (readw(&host->regs->nfc_unlockstart_blkaddr) <= page_addr>>6))) {
-+ writeb(NFC_WRPR_US, &host->regs->main_area[0][0]);
++ writew(NFC_WRPR_US, &host->regs->main_area[0][0]);
+ } else if (readw(&host->regs->nfc_nf_wrprst) & NFC_WRPR_LTS) {
-+ writeb(readw(&host->regs->nfc_nf_wrprst), &host->regs->main_area[0][0]);
++ writew(readw(&host->regs->nfc_nf_wrprst), &host->regs->main_area[0][0]);
+ } else {
-+ writeb(readw(&host->regs->nfc_nf_wrprst) & ~NFC_WRPR_US, host->regs->main_area[0]);
++ writew(readw(&host->regs->nfc_nf_wrprst) & ~NFC_WRPR_US, &host->regs->main_area[0][0]);
+ }
+ return;
+#endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-03-21 14:26:03
|
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 a58152c247e41d10d376bb0928e7d2b3f9279367 (commit)
via 4c743abb34988520ac1a13420335486a39d75204 (commit)
from 950a0f49509c5b52269ea89754b481f450d065d4 (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 a58152c247e41d10d376bb0928e7d2b3f9279367
Merge: 4c743ab 950a0f4
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 21 15:24:18 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 4c743abb34988520ac1a13420335486a39d75204
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 21 15:21:23 2012 +0100
[TOOLS] imxregs: imx51regs.h -> imx5regs.h
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/imxregs/imxregs.mk | 2 +-
target/linux/debug/imxregs/Makefile | 2 +-
.../debug/imxregs/{imx51regs.h => imx5regs.h} | 0
target/linux/debug/imxregs/imxregs.c | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
rename target/linux/debug/imxregs/{imx51regs.h => imx5regs.h} (100%)
diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index 2ce11f2..2711674 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -4,7 +4,7 @@
#
#############################################################
-IMXREGS_VERSION = 1.1
+IMXREGS_VERSION = 1.2
IMXREGS_SITE = $(TOPDIR)/../target/linux/debug/imxregs/
IMXREGS_SITE_METHOD = copy
diff --git a/target/linux/debug/imxregs/Makefile b/target/linux/debug/imxregs/Makefile
index 2d1fc5f..5ef8944 100644
--- a/target/linux/debug/imxregs/Makefile
+++ b/target/linux/debug/imxregs/Makefile
@@ -12,7 +12,7 @@ imx27regs: imxregs.c imx27regs.h definitions.h
imx28regs: imxregs.c imx28regs.h definitions.h
$(CC) -DIMX28 imxregs.c -o $@
-imx51regs: imxregs.c imx51regs.h definitions.h
+imx51regs: imxregs.c imx5regs.h definitions.h
$(CC) -DIMX51 imxregs.c -o $@
clean:
diff --git a/target/linux/debug/imxregs/imx51regs.h b/target/linux/debug/imxregs/imx5regs.h
similarity index 100%
rename from target/linux/debug/imxregs/imx51regs.h
rename to target/linux/debug/imxregs/imx5regs.h
diff --git a/target/linux/debug/imxregs/imxregs.c b/target/linux/debug/imxregs/imxregs.c
index 812bbbf..90ad295 100644
--- a/target/linux/debug/imxregs/imxregs.c
+++ b/target/linux/debug/imxregs/imxregs.c
@@ -36,7 +36,7 @@
#elif defined(IMX28)
#include "imx28regs.h"
#elif defined(IMX51)
-#include "imx51regs.h"
+#include "imx5regs.h"
#else
#include "imxregs.h"
#endif
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-21 12:41:15
|
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 950a0f49509c5b52269ea89754b481f450d065d4 (commit)
via b8c272ff5b568f06b4d2cc8ede5d80690363765a (commit)
from 21ba061c199026dfcc74b86803a93daf472cc692 (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 950a0f49509c5b52269ea89754b481f450d065d4
Merge: b8c272f 21ba061
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 21 13:51:59 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit b8c272ff5b568f06b4d2cc8ede5d80690363765a
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 21 12:36:48 2012 +0100
[UBOOT] apf27: restore imxfuse command
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 13 +-
.../u-boot/2011.12/340-apf27-misc-commands.patch | 349 ++++++++++++++++++++
2 files changed, 356 insertions(+), 6 deletions(-)
create mode 100644 patches/u-boot/2011.12/340-apf27-misc-commands.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index a839f4c..9ac2f98 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -88,7 +88,7 @@
#define CONFIG_CMD_FAT /* FAT support */
#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
/*#define CONFIG_CMD_I2C */ /* I2C serial bus support */
-/*#define CONFIG_CMD_IIM */ /* imx iim fuse */
+#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
#undef CONFIG_CMD_IMLS /* List all found images */
#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
#define CONFIG_CMD_MII /* MII support */
@@ -700,11 +700,12 @@
* IIM fuse Config
*/
-#ifdef CONFIG_CMD_IIM
-#define CONFIG_IMX_IIM
-#define CONFIG_IIM_MAC_BANK 0
-#define CONFIG_IIM_MAC_ROW 5
-#endif /* CONFIG_CMD_IIM */
+#ifdef CONFIG_CMD_IMX_FUSE
+#define IIM_MAC_BANK 0
+#define IIM_MAC_ROW 5
+#define IIM0_SCC_KEY 11
+#define IIM1_SUID 1
+#endif /*CONFIG_CMD_IMX_FUSE */
/*
* External interfaces module
diff --git a/patches/u-boot/2011.12/340-apf27-misc-commands.patch b/patches/u-boot/2011.12/340-apf27-misc-commands.patch
new file mode 100644
index 0000000..c231719
--- /dev/null
+++ b/patches/u-boot/2011.12/340-apf27-misc-commands.patch
@@ -0,0 +1,349 @@
+Index: /board/armadeus/apf27/cmd_imxfuse.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ /board/armadeus/apf27/cmd_imxfuse.c 2011-01-05 18:08:44.000000000 +0100
+@@ -0,0 +1,331 @@
++/*
++ * cmd_imxfuse-c Interface to iMX IC Identification Module
++ * Based on Freescale iMX27 Board Support Package
++ *
++ * (C) Copyright 2008,2009 Eric Jarrige <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
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#include <config.h>
++#include <common.h>
++#include <command.h>
++
++#ifdef CONFIG_CMD_IMX_FUSE
++
++#include <asm/arch/imx-regs.h>
++#include <asm/io.h>
++
++#define IIM_ERR_SHIFT 8
++#define POLL_FUSE_PRGD (IIM_STAT_PRGD | (IIM_ERR_PRGE << IIM_ERR_SHIFT))
++#define POLL_FUSE_SNSD (IIM_STAT_SNSD | (IIM_ERR_SNSE << IIM_ERR_SHIFT))
++
++static void imx_fuse_op_start(void)
++{
++ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
++ /* Do not generate interrupt */
++ writel(0x00, &iim->iim_statm);
++ // clear the status bits and error bits
++ writel(0x03, &iim->iim_stat);
++ writel(0xFE, &iim->iim_err);
++}
++
++/*
++ * The action should be either:
++ * POLL_FUSE_PRGD
++ * or:
++ * POLL_FUSE_SNSD
++ */
++static int imx_poll_fuse_op_done(int action)
++{
++ u32 status, error;
++ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
++
++ if (action != POLL_FUSE_PRGD && action != POLL_FUSE_SNSD) {
++ printf("%s(%d) invalid operation\n", __FUNCTION__, action);
++ return -1;
++ }
++
++ /* Poll busy bit till it is NOT set */
++ while ((readl(&iim->iim_stat) & IIM_STAT_BUSY) != 0 ) {
++ }
++
++ /* Test for successful write */
++ status = readl(&iim->iim_stat);
++ error = readl(&iim->iim_err);
++
++ if ((status & action) != 0 && (error & (action >> IIM_ERR_SHIFT)) == 0) {
++ if (error) {
++ printf("Even though the operation seems successful...\n");
++ printf("There are some error(s) at addr=0x%x: 0x%x\n",
++ readl(&iim->iim_err), error);
++ }
++ return 0;
++ }
++ printf("%s(0x%x) failed\n", __FUNCTION__, action);
++ printf("status address=0x%x, value=0x%x\n",
++ readl(&iim->iim_stat), status);
++ printf("There are some error(s) at addr=0x%x: 0x%x\n",
++ readl(&iim->iim_err), error);
++ return -1;
++}
++
++static int imx_read_shadow_fuse(int bank, int row, int bit)
++{
++ printf("Shadow fuses at (bank:%d, row:%d) = 0x%x\n",
++ bank, row, readl((long*)IIM_BANK_REG(bank,row)));
++ return 0;
++}
++
++static int imx_sense_fuse(int bank, int row, int bit)
++{
++ int addr, addr_l, addr_h;
++ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
++
++ imx_fuse_op_start();
++
++ /* Enable IIM Program Protect */
++ writel(0x0,&iim->iim_prog_p);
++
++ addr = ((bank << 11) | (row << 3) | (bit & 0x7));
++ /* Set IIM Program Upper Address */
++ addr_h = (addr >> 8) & 0x000000FF;
++ /* Set IIM Program Lower Address */
++ addr_l = (addr & 0x000000FF);
++
++#ifdef IIM_FUSE_DEBUG
++ printf("%s: addr_h=0x%x, addr_l=0x%x\n",
++ __FUNCTION__, addr_h, addr_l);
++#endif
++ writel(addr_h, &iim->iim_ua);
++ writel(addr_l, &iim->iim_la);
++
++ /* Start sensing */
++ writel(0x08, &iim->iim_fctl);
++ if (imx_poll_fuse_op_done(POLL_FUSE_SNSD) != 0) {
++ printf("%s(bank: %d, row: %d, bit: %d failed\n",
++ __FUNCTION__, bank, row, bit);
++ }
++
++ printf("fuses at (bank:%d, row:%d) = 0x%x\n",
++ bank, row, readl(&iim->iim_sdat));
++ return 0;
++}
++
++/* Blow fuses based on the bank, row and bit positions (all 0-based)
++*/
++static int imx_fuse_blow(int bank,int row,int bit)
++{
++ int addr, addr_l, addr_h, ret = 1;
++ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
++
++ imx_fuse_op_start();
++
++ /* Disable IIM Program Protect */
++ writel(0xAA, &iim->iim_prog_p);
++
++ addr = ((bank << 11) | (row << 3) | (bit & 0x7));
++ /* Set IIM Program Upper Address */
++ addr_h = (addr >> 8) & 0x000000FF;
++ /* Set IIM Program Lower Address */
++ addr_l = (addr & 0x000000FF);
++
++#ifdef IIM_FUSE_DEBUG
++ printf("blowing addr_h=0x%x, addr_l=0x%x\n", addr_h, addr_l);
++#endif
++
++ writel(addr_h, &iim->iim_ua);
++ writel(addr_l, &iim->iim_la);
++ /* Start Programming */
++ writel(0x31, &iim->iim_fctl);
++ if (imx_poll_fuse_op_done(POLL_FUSE_PRGD) == 0) {
++ ret = 0;
++ }
++
++ /* Enable IIM Program Protect */
++ writel(0x0, &iim->iim_prog_p);
++ return ret;
++}
++
++/* Blow byte fuses based on the bank and row positions (all 0-based)
++*/
++static int imx_fuse_blow_byte(int bank,int row,unsigned char value)
++{
++ int i, ret = 0;
++
++ for (i = 0; i < 8; i++) {
++ if (((value >> i) & 0x1) == 0) {
++ continue;
++ }
++ ret |= imx_fuse_blow(bank, row, i);
++ }
++
++ return ret;
++}
++
++static int imx_mac_read(unsigned char pmac[6])
++{
++ int i;
++ int uninitialized = 0;
++ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
++ struct fuse_bank *bank = &iim->bank[0];
++ struct fuse_bank0_regs *fuse =
++ (struct fuse_bank0_regs *)bank->fuse_regs;
++
++ for (i = 0; i < 6; i++) {
++ pmac[6 - 1 - i] = readl(&fuse->mac_addr[i]) & 0xff;
++ }
++
++ /* uninitialized if all 00 */
++ if ((pmac[0] == 0) && (pmac[1] == 0) && (pmac[2] == 0) &&
++ (pmac[3] == 0) && (pmac[4] == 0) && (pmac[5] == 0))
++ uninitialized = 1;
++
++ return uninitialized;
++}
++
++static int imx_mac_blow(unsigned char pmac[6])
++{
++ int i, ret = 1;
++ unsigned char mac[6];
++ int uninitialized = 0;
++
++ uninitialized = imx_mac_read(mac);
++
++ if (uninitialized) {
++ ret = 0;
++ for(i=0;i<6;i++) {
++ ret |= imx_fuse_blow_byte(IIM_MAC_BANK,
++ (IIM_MAC_ROW+i), pmac[6 - 1 -i]);
++ }
++ }
++
++ return ret;
++}
++
++
++int do_imx_fuse(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
++{
++ uint32_t bank, row, value, i;
++ int ret = 1;
++
++ if (argc < 2) {
++ printf("It is too dangeous for you to use this command.\n");
++ printf("Usage:\n%s\n", cmdtp->usage);
++ return ret;
++ }
++
++ if ((!strcmp(argv[1], "sense"))&&((argc == 4))) {
++ bank = simple_strtoul(argv[2], NULL, 16);
++ row = simple_strtoul(argv[3], NULL, 16);
++
++ printf("Sense read fuse at bank:%d row:%d\n", bank, row);
++ ret = imx_sense_fuse(bank, row, 0);
++ }else if ((!strcmp(argv[1], "read"))&&((argc == 4))) {
++ bank = simple_strtoul(argv[2], NULL, 16);
++ row = simple_strtoul(argv[3], NULL, 16);
++
++ printf("Shadow read fuse at bank:%d row:%d\n", bank, row);
++ ret = imx_read_shadow_fuse(bank, row, 0);
++ }else if ((!strcmp(argv[1], "blow"))&&(argc == 5)) {
++ bank = simple_strtoul(argv[2], NULL, 16);
++ row = simple_strtoul(argv[3], NULL, 16);
++ value = simple_strtoul(argv[4], NULL, 16);
++
++ printf("Blowing fuse at bank:%d row:%d value:%d\n",
++ bank, row, value);
++ for (i = 0; i < 8; i++) {
++ if (((value >> i) & 0x1) == 0) {
++ continue;
++ }
++ if (imx_fuse_blow(bank, row, i) != 0) {
++ printf("fuse_blow(bank: %d, row: %d, bit:"
++ " %d failed\n", bank, row, i);
++ } else {
++ printf("fuse_blow(bank: %d, row: %d, bit:"
++ " %d successful\n", bank, row, i);
++ ret = 0;
++ }
++ }
++
++ /* read back fuse by shadow register if applicable */
++ ret |= imx_read_shadow_fuse(bank, row, 0);
++
++ }else if ((!strcmp(argv[1], "mac"))&&(argc == 2)) {
++ unsigned char mac[6];
++ ret = imx_mac_read(mac);
++
++ printf("%siMX mac_addr in fuse: %02X:%02X:%02X:%02X:%02X:%02X\n",
++ ret?"No ":"",
++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
++ }else if ((!strcmp(argv[1], "mac"))&&(argc == 3)) {
++ unsigned char mac[6];
++ char *tmp, *end;
++
++ tmp = argv[2];
++ /* convert MAC from string to int */
++ for (i=0; i<6; i++) {
++ mac[i] = tmp ? simple_strtoul(tmp, &end, 16) : 0;
++ if (tmp)
++ tmp = (*end) ? end+1 : end;
++ }
++
++ ret = imx_mac_blow(mac);
++ if (ret) {
++ printf("Failed to blow mac_addr in fuse: "
++ "%02X:%02X:%02X:%02X:%02X:%02X\n",
++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
++ } else {
++ imx_mac_read(mac);
++ printf("Mac_addr blowed in fuse: "
++ "%02X:%02X:%02X:%02X:%02X:%02X\n",
++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
++ }
++ }else if ((!strcmp(argv[1], "suid"))&&(argc == 2)) {
++
++ printf("iMX SUID: ");
++ for (i=0;i<6;i++) {
++ printf("%02x", readl((long*)IIM_BANK_REG(1,(IIM1_SUID+i))));
++ }
++ printf("\n");
++ ret = 0;
++ }else if ((!strcmp(argv[1], "scc_key"))&&(argc == 2)) {
++
++ printf("iMX SCC_KEY: ");
++ for (i=0;i<21;i++) {
++ printf("%02x", readl((long*)IIM_BANK_REG(0,(IIM0_SCC_KEY+i))));
++ }
++ printf("\n");
++ ret = 0;
++ } else { printf("arc:%d\n", argc);
++ printf("Usage:\n%s\n", cmdtp->usage);
++ return 1;
++ }
++
++ return ret;
++}
++
++U_BOOT_CMD(imxfuse, 5, 0, do_imx_fuse,
++ "imxfuse - Read/Blow some iMX fuses\n",\
++ "sense <bank> <row> - sense read iMX fuses at <bank>/<row>\n" \
++ "imxfuse read <bank> <row> - shadow read iMX fuses at <bank>/<row>\n" \
++ "imxfuse blow <bank> <row> <value> - blow <value> at <bank>/<row>\n"\
++ " - Read/Blow 8 bits <Value> for some iMX fuses at <bank>/<row>\n"\
++ "imxfuse mac [<mac_addr>] - read/blow <mac_addr> in iMX fuses\n"\
++ "imxfuse suid - read iMX SUID\n"\
++ "imxfuse scc_key - read iMX SCC_KEY\n");
++
++#endif /* CONFIG_CMD_IMX_FUSE */
+Index: /board/armadeus/apf27/mx27/Makefile
+===================================================================
+--- /board/armadeus/apf27/Makefile 2011-01-05 18:05:13.000000000 +0100
++++ /board/armadeus/apf27/Makefile 2011-01-05 18:08:44.000000000 +0100
+@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
+
+ LIB = $(obj)lib$(BOARD).o
+
+-COBJS := apf27.o fpga.o
++COBJS := apf27.o fpga.o cmd_imxfuse.o
+ SOBJS := lowlevel_init.o
+
+ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2012-03-21 09:29:58
|
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 21ba061c199026dfcc74b86803a93daf472cc692 (commit)
via 6b0d95deaf3e9c0bb6fddd21ec541ea01f0a2e85 (commit)
from c1357200e0901c9026592c0909d208021fa5c454 (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 21ba061c199026dfcc74b86803a93daf472cc692
Merge: 6b0d95d c135720
Author: Fabien Marteau <fab...@ar...>
Date: Wed Mar 21 09:26:46 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 6b0d95deaf3e9c0bb6fddd21ec541ea01f0a2e85
Author: Fabien Marteau <fab...@ar...>
Date: Wed Mar 21 09:26:21 2012 +0100
[linux] patch is from Karo
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch | 16 ----------
.../2.6.38/359-karo-imx-fix_clock_on_i2c.patch | 31 ++++++++++++++++++++
2 files changed, 31 insertions(+), 16 deletions(-)
delete mode 100644 patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
create mode 100644 patches/linux/2.6.38/359-karo-imx-fix_clock_on_i2c.patch
diff --git a/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch b/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
deleted file mode 100644
index 551d95a..0000000
--- a/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
-===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-20 11:02:14.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-20 11:02:32.000000000 +0100
-@@ -1198,9 +1198,9 @@
-
- /* I2C */
- DEFINE_CLOCK(i2c1_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG9_OFFSET,
-- NULL, NULL, &ipg_clk, NULL);
-+ NULL, NULL, &ipg_perclk, NULL);
- DEFINE_CLOCK(i2c2_clk, 1, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG10_OFFSET,
-- NULL, NULL, &ipg_clk, NULL);
-+ NULL, NULL, &ipg_perclk, NULL);
- DEFINE_CLOCK(hsi2c_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG11_OFFSET,
- NULL, NULL, &ipg_clk, NULL);
-
diff --git a/patches/linux/2.6.38/359-karo-imx-fix_clock_on_i2c.patch b/patches/linux/2.6.38/359-karo-imx-fix_clock_on_i2c.patch
new file mode 100644
index 0000000..41940b5
--- /dev/null
+++ b/patches/linux/2.6.38/359-karo-imx-fix_clock_on_i2c.patch
@@ -0,0 +1,31 @@
+mach-mx5: fix the I2C clock parents
+
+The clock from which the I2C timing is derived is the ipg_perclk
+not ipg_clk.
+
+I2C bus frequency was lower by a factor of ~8 due to the clock divider
+calculation being based on 66.5MHz IPG clock while the bus actually
+uses 8MHz ipg_perclk.
+
+Kernel version: 3.0.0-rc2 branch 'imx-for-next' of
+git://git.pengutronix.de/git/imx/linux-2.6
+
+Signed-off-by: Lothar WaÃmann <LW at KARO-electronics.de>
+Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
+---
+Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
+===================================================================
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-20 11:02:14.000000000 +0100
++++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-20 11:02:32.000000000 +0100
+@@ -1198,9 +1198,9 @@
+
+ /* I2C */
+ DEFINE_CLOCK(i2c1_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG9_OFFSET,
+- NULL, NULL, &ipg_clk, NULL);
++ NULL, NULL, &ipg_perclk, NULL);
+ DEFINE_CLOCK(i2c2_clk, 1, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG10_OFFSET,
+- NULL, NULL, &ipg_clk, NULL);
++ NULL, NULL, &ipg_perclk, NULL);
+ DEFINE_CLOCK(hsi2c_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG11_OFFSET,
+ NULL, NULL, &ipg_clk, NULL);
+
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2012-03-20 17:42:37
|
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 c1357200e0901c9026592c0909d208021fa5c454 (commit)
via 22cc25fe19187e192ef514dd8c09c1655b1701ed (commit)
from 8e7a8de3f5f0956a37b417024cad9fa7fce8a771 (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 c1357200e0901c9026592c0909d208021fa5c454
Merge: 22cc25f 8e7a8de
Author: Fabien Marteau <fab...@ar...>
Date: Tue Mar 20 18:41:29 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 22cc25fe19187e192ef514dd8c09c1655b1701ed
Author: Fabien Marteau <fab...@ar...>
Date: Tue Mar 20 18:41:14 2012 +0100
[software][uboot_recover] Don't use TAB in python code
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf28_recover.py | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/software/uboot_recover/apf28_recover.py b/software/uboot_recover/apf28_recover.py
index a90c53b..67b410c 100644
--- a/software/uboot_recover/apf28_recover.py
+++ b/software/uboot_recover/apf28_recover.py
@@ -98,13 +98,13 @@ class UBoot:
time.sleep(1)
self.serial.write("\n")
ret = self.__getOutput()
- self.serial.flushInput()
+ self.serial.flushInput()
return ret
def flash(self):
""" Ask U-Boot to flash itself """
time.sleep(1)
- self.serial.flushInput()
+ self.serial.flushInput()
self.serial.write("run flash_uboot\n")
try:
ret = self.__getOutput()
@@ -119,7 +119,7 @@ class UBoot:
def reset(self):
""" Ask U-Boot to flash itself """
time.sleep(1)
- self.serial.flushInput()
+ self.serial.flushInput()
self.serial.write("reset\n")
try:
ret = self.__getOutput()
@@ -166,7 +166,7 @@ if __name__ == "__main__":
ser = serial.Serial(port, SPEED, timeout=4)
except Exception, msg:
print "Unable to open serial port %s !" % port
- print msg
+ print msg
sys.exit()
ser.flush()
@@ -185,9 +185,9 @@ if __name__ == "__main__":
os.system(ELFTOSB_APP + " -zdf imx28 -c apf28-u-boot_recover.bd -o " + NAND_BINARY)
except Exception, msg:
print "Failed to build build NAND image filet !"
- print msg
- os.remove(NAND_BINARY);
- os.remove(ENV_RECOVER);
+ print msg
+ os.remove(NAND_BINARY);
+ os.remove(ENV_RECOVER);
sys.exit()
print "Downloading NAND image file %s.." % NAND_BINARY
@@ -195,9 +195,9 @@ if __name__ == "__main__":
os.system(USB_DOWNLOAD_APP + " -f " + NAND_BINARY)
except Exception, msg:
print "Failed to upload NAND image file to the target !"
- print msg
- os.remove(NAND_BINARY);
- os.remove(ENV_RECOVER);
+ print msg
+ os.remove(NAND_BINARY);
+ os.remove(ENV_RECOVER);
sys.exit()
os.remove(NAND_BINARY);
@@ -211,7 +211,7 @@ if __name__ == "__main__":
os.system(USB_DOWNLOAD_APP + " -f " + BINARY)
except Exception, msg:
print "Failed to upload image file to the target !"
- print msg
+ print msg
sys.exit()
uboot.waitForPrompt()
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-20 17:40:05
|
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 8e7a8de3f5f0956a37b417024cad9fa7fce8a771 (commit)
from e389ee6aa60976a0c46f4cbeb03394ffa2c93a65 (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 8e7a8de3f5f0956a37b417024cad9fa7fce8a771
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 20 18:50:42 2012 +0100
[UBOOT] apf27: cleanup ongoing
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 40 +++++++++++++++----
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index a74d14a..a839f4c 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -38,6 +38,7 @@
#define CONFIG_MX27 1 /* in a Freescale i.MX27 Chip */
#define CONFIG_APF27 1 /* on a Armadeus project APF27 board */
#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
+#define CONFIG_MACH_TYPE 1698
/*
* Enable the call to misc_init_r() for miscellaneous platform
@@ -80,13 +81,14 @@
#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
#define CONFIG_CMD_CDP /* Cisco Discovery Protocol */
-//#define CONFIG_CMD_DATE /* support for RTC, date/time...*/
+/*#define CONFIG_CMD_DATE */ /* support for RTC, date/time...*/
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DIAG /* Diagnostics */
-//#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
+/*#define CONFIG_CMD_EEPROM */ /* EEPROM read/write support */
#define CONFIG_CMD_FAT /* FAT support */
#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
-//#define CONFIG_CMD_I2C /* I2C serial bus support */
+/*#define CONFIG_CMD_I2C */ /* I2C serial bus support */
+/*#define CONFIG_CMD_IIM */ /* imx iim fuse */
#undef CONFIG_CMD_IMLS /* List all found images */
#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
#define CONFIG_CMD_MII /* MII support */
@@ -98,12 +100,11 @@
#define CONFIG_CMD_PING /* ping support */
#define CONFIG_CMD_SAVES /* save S record dump */
#define CONFIG_CMD_SETEXPR /* setexpr support */
-//#define CONFIG_CMD_SNTP /* SNTP support */
+/*#define CONFIG_CMD_SNTP */ /* SNTP support */
#define CONFIG_CMD_NFS /* NFS support */
#define CONFIG_CMD_DNS
#define CONFIG_CMD_UBI
#define CONFIG_CMD_UBIFS
-#define CONFIG_CMD_IMX_FUSE /* iMX fuse access commands */
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DISPLAY_CPUINFO
@@ -168,12 +169,26 @@
"nfsboot=setenv bootargs ${console} ${mtdparts};" \
"run addnfsargs addipargs; setenv autostart yes;" \
"nboot A0000000 0 ${kernel_offset}\0" \
+ "nfsboot2=setenv bootargs ${console} ${mtdparts};" \
+ "run addnfsargs addipargs; setenv autostart yes;" \
+ "setenv kernel_image ${board_name}-linux.bin;" \
+ "nfs ${loadaddr} " \
+ "${serverip}:${rootpath}/${kernel_image};" \
+ "bootm\0" \
"ubifsboot=setenv bootargs ${console} ${mtdparts};" \
"run addubifsargs addipargs; setenv autostart yes;" \
"nboot A0000000 0 ${kernel_offset}\0" \
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; setenv autostart yes;" \
"nboot A0000000 0 ${kernel_offset}\0" \
+ "boot_nfs_fallback_flash=if ping ${serverip};" \
+ "then echo Boot over NFS; run nfsboot;" \
+ "else echo Boot from the board; run ubifsboot;" \
+ "fi\0" \
+ "boot_nfs2_fallback_flash=if ping ${serverip};" \
+ "then echo Boot over NFS; run nfsboot2;" \
+ "else echo Boot from the board; run ubifsboot;" \
+ "fi\0" \
"firmware_autoload=0\0" \
"flash_uboot=nand unlock ${uboot_offset} ${uboot_len};" \
"nand erase ${uboot_offset} ${uboot_len};" \
@@ -217,12 +232,9 @@
"unlock_regs=mw 10000008 0; mw 10020008 0\0" \
#define CONFIG_BOOTCOMMAND "run ubifsboot"
-#define CFG_AUTOLOAD "no"
+#define CONFIG_SYS_AUTOLOAD "no"
#define CFG_DIRECT_FLASH_TFTP
-#define CONFIG_MACH_TYPE 1698
-#define CONFIG_BOOT_PARAMS_ADDR 0xa0000100
-
#undef CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_ETHADDR
@@ -684,6 +696,16 @@
#define CONFIG_MXC_MMC
#define CONFIG_MXC_MCI_REGS_BASE 0x10014000
+/**
+ * IIM fuse Config
+ */
+
+#ifdef CONFIG_CMD_IIM
+#define CONFIG_IMX_IIM
+#define CONFIG_IIM_MAC_BANK 0
+#define CONFIG_IIM_MAC_ROW 5
+#endif /* CONFIG_CMD_IIM */
+
/*
* External interfaces module
*
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2012-03-20 13:05:31
|
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 e389ee6aa60976a0c46f4cbeb03394ffa2c93a65 (commit)
via 61b83f7e00ae1bbf36beece2df704821a56343a2 (commit)
from 2adca3896e79a4ffe437f2a04a8162e51ea87045 (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 e389ee6aa60976a0c46f4cbeb03394ffa2c93a65
Merge: 61b83f7 2adca38
Author: Fabien Marteau <fab...@ar...>
Date: Tue Mar 20 14:05:14 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 61b83f7e00ae1bbf36beece2df704821a56343a2
Author: Fabien Marteau <fab...@ar...>
Date: Tue Mar 20 14:04:44 2012 +0100
[linux] change i2c clock
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch | 26 ++++++++++---------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch b/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
index a524651..551d95a 100644
--- a/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
+++ b/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
@@ -1,14 +1,16 @@
-Index: linux-2.6.38.8/drivers/i2c/busses/i2c-imx.c
+Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
===================================================================
---- linux-2.6.38.8.orig/drivers/i2c/busses/i2c-imx.c 2012-03-19 18:50:33.000000000 +0100
-+++ linux-2.6.38.8/drivers/i2c/busses/i2c-imx.c 2012-03-19 18:51:16.000000000 +0100
-@@ -248,7 +248,8 @@
- int i;
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-20 11:02:14.000000000 +0100
++++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-20 11:02:32.000000000 +0100
+@@ -1198,9 +1198,9 @@
+
+ /* I2C */
+ DEFINE_CLOCK(i2c1_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG9_OFFSET,
+- NULL, NULL, &ipg_clk, NULL);
++ NULL, NULL, &ipg_perclk, NULL);
+ DEFINE_CLOCK(i2c2_clk, 1, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG10_OFFSET,
+- NULL, NULL, &ipg_clk, NULL);
++ NULL, NULL, &ipg_perclk, NULL);
+ DEFINE_CLOCK(hsi2c_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG11_OFFSET,
+ NULL, NULL, &ipg_clk, NULL);
- /* Divider value calculation */
-- i2c_clk_rate = clk_get_rate(i2c_imx->clk);
-+ //i2c_clk_rate = clk_get_rate(i2c_imx->clk);
-+ i2c_clk_rate = 10200000; //XXX: there is an error in clk tree
- div = (i2c_clk_rate + rate - 1) / rate;
- if (div < i2c_clk_div[0][0])
- i = 0;
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-20 13:04: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 2adca3896e79a4ffe437f2a04a8162e51ea87045 (commit)
from ea1a9356432018629f5f43b6932f963403335446 (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 2adca3896e79a4ffe437f2a04a8162e51ea87045
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 20 14:15:31 2012 +0100
[UBOOT] apf27: board refactoring and fix nand issue with UBoot 2011.12
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 76 +++++++----------
...-Add-support-for-the-armadeus-apf27-board.patch | 93 +++++++++++++-------
patches/u-boot/2011.12/310-apf27-nand-spl.patch | 16 ++--
3 files changed, 99 insertions(+), 86 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index 148e345..a74d14a 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -31,8 +31,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "2.0"
-#define CONFIG_IDENT_STRING " apf27 patch 2.7"
+#define CONFIG_ENV_VERSION "2.1"
+#define CONFIG_IDENT_STRING " apf27 patch 2.8"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
#define CONFIG_MX27 1 /* in a Freescale i.MX27 Chip */
@@ -88,13 +88,13 @@
#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
//#define CONFIG_CMD_I2C /* I2C serial bus support */
#undef CONFIG_CMD_IMLS /* List all found images */
-#define CONFIG_CMD_IMMAP /* IMMR dump support */
#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
#define CONFIG_CMD_MII /* MII support */
#define CONFIG_CMD_MTDPARTS /* MTD partition support */
#define CONFIG_CMD_MMC /* MMC memory mapped support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK
+#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_CMD_PING /* ping support */
#define CONFIG_CMD_SAVES /* save S record dump */
#define CONFIG_CMD_SETEXPR /* setexpr support */
@@ -120,11 +120,11 @@
/*
* Boot options. Setting delay to -1 stops autostart count down.
*/
-#define CONFIG_BOOTDELAY 20
+#define CONFIG_BOOTDELAY 5
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTARGS \
- CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
+ CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)
#define CONFIG_MTDMAP "mxc_nand.0"
@@ -159,8 +159,6 @@
"quiet=1\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
- "addjffsargs=setenv bootargs ${bootargs} " \
- "root=/dev/mtdblock4 rootfstype=jffs2\0" \
"addubifsargs=setenv bootargs ${bootargs} " \
"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
"addmmcargs=setenv bootargs ${bootargs} " \
@@ -169,26 +167,23 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off \0"\
"nfsboot=setenv bootargs ${console} ${mtdparts};" \
"run addnfsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
- "jffsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addjffsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
+ "nboot A0000000 0 ${kernel_offset}\0" \
"ubifsboot=setenv bootargs ${console} ${mtdparts};" \
"run addubifsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
+ "nboot A0000000 0 ${kernel_offset}\0" \
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
+ "nboot A0000000 0 ${kernel_offset}\0" \
"firmware_autoload=0\0" \
"flash_uboot=nand unlock ${uboot_offset} ${uboot_len};" \
"nand erase ${uboot_offset} ${uboot_len};" \
- "if nand write.jffs2 ${fileaddr} ${uboot_offset} ${filesize};" \
+ "if nand write.trimffs ${fileaddr} ${uboot_offset} ${filesize};" \
"then nand lock; nand unlock ${env_offset};" \
"echo Flashing of uboot succeed;" \
"else echo Flashing of uboot failed;" \
"fi; \0" \
"flash_firmware=nand erase ${firmware_offset} ${firmware_len};"\
- "if nand write.jffs2 ${fileaddr} ${firmware_offset} ${filesize} ;"\
+ "if nand write.trimffs ${fileaddr} ${firmware_offset} ${filesize} ;"\
"then echo Flashing of Firmware succeed;" \
"else echo Flashing of Firmware failed;" \
"fi\0" \
@@ -196,12 +191,12 @@
"run flash_firmware;"\
"fpga load 0 ${fileaddr} ${firmware_len};\0"\
"flash_kernel=nand erase ${kernel_offset} ${kernel_len};" \
- "if nand write.jffs2 ${fileaddr} ${kernel_offset} ${filesize} ;"\
+ "if nand write.trimffs ${fileaddr} ${kernel_offset} ${filesize} ;"\
"then echo Flashing of kernel succeed;" \
"else echo Flashing of kernel failed;" \
"fi\0" \
- "flash_rootfs=nand erase clean ${rootfs_offset} ${rootfs_len};" \
- "if nand write.jffs2 ${fileaddr} ${rootfs_offset} ${filesize};"\
+ "flash_rootfs=nand erase.part rootfs;" \
+ "if nand write.trimffs ${fileaddr} ${rootfs_offset} ${filesize};"\
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
@@ -225,7 +220,7 @@
#define CFG_AUTOLOAD "no"
#define CFG_DIRECT_FLASH_TFTP
-#define CONFIG_MACH_TYPE MACH_TYPE_APF27
+#define CONFIG_MACH_TYPE 1698
#define CONFIG_BOOT_PARAMS_ADDR 0xa0000100
#undef CONFIG_SHOW_BOOT_PROGRESS
@@ -357,16 +352,17 @@
/*
* SDRAM definition parameter
*/
+#define PHYS_SDRAM_1 0xA0000000
+#define PHYS_SDRAM_2 0xB0000000
+
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 8)
/* micron 8MB */
-#define CONFIG_SYS_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_1_SIZE 0x00800000 /* 8 MB */
-#define CONFIG_SYS_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_2_SIZE 0x00800000 /* 8 MB */
+#define PHYS_SDRAM_1_SIZE 0x00800000 /* 8 MB */
+#define PHYS_SDRAM_2_SIZE 0x00800000 /* 8 MB */
#define CONFIG_SYS_SDRAM_NUM_COL 8 /* 8, 9, 10 or 11 column address bits */
#define CONFIG_SYS_SDRAM_NUM_ROW 11 /* 11, 12 or 13 row address bits */
#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -388,10 +384,8 @@
#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 16)
/* micron 16MB */
-#define CONFIG_SYS_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_1_SIZE 0x01000000 /* 16 MB */
-#define CONFIG_SYS_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_2_SIZE 0x01000000 /* 16 MB */
+#define PHYS_SDRAM_1_SIZE 0x01000000 /* 16 MB */
+#define PHYS_SDRAM_2_SIZE 0x01000000 /* 16 MB */
#define CONFIG_SYS_SDRAM_NUM_COL 8 /* 8, 9, 10 or 11 column address bits */
#define CONFIG_SYS_SDRAM_NUM_ROW 12 /* 11, 12 or 13 row address bits */
#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -413,10 +407,8 @@
#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 32)
/* micron 32MB */
-#define CONFIG_SYS_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */
-#define CONFIG_SYS_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_2_SIZE 0x02000000 /* 32 MB */
+#define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */
+#define PHYS_SDRAM_2_SIZE 0x02000000 /* 32 MB */
#define CONFIG_SYS_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
#define CONFIG_SYS_SDRAM_NUM_ROW 12 /* 11, 12 or 13 row address bits */
#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -438,10 +430,8 @@
#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
/* micron 64MB */
-#define CONFIG_SYS_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */
-#define CONFIG_SYS_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_2_SIZE 0x04000000 /* 64 MB */
+#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */
+#define PHYS_SDRAM_2_SIZE 0x04000000 /* 64 MB */
#define CONFIG_SYS_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
#define CONFIG_SYS_SDRAM_NUM_ROW 13 /* 11, 12 or 13 row address bits */
#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -463,10 +453,8 @@
#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 128)
/* micron 128MB */
-#define CONFIG_SYS_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
-#define CONFIG_SYS_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_2_SIZE 0x08000000 /* 128 MB */
+#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
+#define PHYS_SDRAM_2_SIZE 0x08000000 /* 128 MB */
#define CONFIG_SYS_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
#define CONFIG_SYS_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -488,10 +476,8 @@
#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 256)
/* micron 256MB */
-#define CONFIG_SYS_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_1_SIZE 0x10000000 /* 256 MB */
-#define CONFIG_SYS_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_2_SIZE 0x10000000 /* 256 MB */
+#define PHYS_SDRAM_1_SIZE 0x10000000 /* 256 MB */
+#define PHYS_SDRAM_2_SIZE 0x10000000 /* 256 MB */
#define CONFIG_SYS_SDRAM_NUM_COL 10 /* 8, 9, 10 or 11 column address bits */
#define CONFIG_SYS_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -511,7 +497,7 @@
#define CONFIG_SYS_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
#endif
-#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_SDRAM_1_BASE
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
/* lowlevel_linit copy U-Boot at CONFIG_SYS_INIT_SP_ADDR (here in RAM) */
/* making u-boot runnable from flash and also RAM that is usefull to boot */
@@ -521,7 +507,7 @@
#endif
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE \
- + CONFIG_SYS_SDRAM_1_SIZE - 0x0100000)
+ + PHYS_SDRAM_1_SIZE - 0x0100000)
/*
* Configuration for no NOR FLASH memory
diff --git a/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
index 577b8d1..ba99f40 100644
--- a/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
+++ b/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
@@ -79,7 +79,7 @@ new file mode 100644
index 0000000..e08b7a2
--- /dev/null
+++ b/board/armadeus/apf27/apf27.c
-@@ -0,0 +1,200 @@
+@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2007 Sascha Hauer, Pengutronix
+ * Copyright (C) 2008,2009 Eric Jarrige <jo...@us...>
@@ -106,6 +106,7 @@ index 0000000..e08b7a2
+#include "fpga.h"
+#include <nand.h>
+#include <asm/arch/imx-regs.h>
++#include <asm/errno.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
@@ -176,12 +177,7 @@ index 0000000..e08b7a2
+int
+board_init (void)
+{
-+
-+ gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
-+ gd->bd->bi_boot_params = CONFIG_BOOT_PARAMS_ADDR;
-+
-+ /* On apf27 U-Boot is always in the relocatated stated */
-+ gd->flags |= GD_FLG_RELOC;
++ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+
+ apf27_devices_init();
+
@@ -192,27 +188,22 @@ index 0000000..e08b7a2
+dram_init (void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
-+ gd->ram_size = 0;
-+#if ( CONFIG_NR_DRAM_BANKS > 0 )
-+ gd->ram_size += get_ram_size((void *)CONFIG_SYS_SDRAM_1_BASE,
-+ CONFIG_SYS_SDRAM_1_SIZE);
-+#endif
++ gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
++ PHYS_SDRAM_1_SIZE);
+#if ( CONFIG_NR_DRAM_BANKS > 1 )
-+ gd->ram_size += get_ram_size((void *)CONFIG_SYS_SDRAM_2_BASE,
-+ CONFIG_SYS_SDRAM_2_SIZE);
++ gd->ram_size += get_ram_size((void *)PHYS_SDRAM_2,
++ PHYS_SDRAM_2_SIZE);
+#endif
+ return 0;
+}
+
+void dram_init_banksize(void)
+{
-+#if ( CONFIG_NR_DRAM_BANKS > 0 )
-+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_1_BASE;
-+ gd->bd->bi_dram[0].size = CONFIG_SYS_SDRAM_1_SIZE;
-+#endif
++ gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
++ gd->bd->bi_dram[0].size = gd->ram_size / CONFIG_NR_DRAM_BANKS;
+#if ( CONFIG_NR_DRAM_BANKS > 1 )
-+ gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_2_BASE;
-+ gd->bd->bi_dram[1].size = CONFIG_SYS_SDRAM_2_SIZE;
++ gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
++ gd->bd->bi_dram[1].size = gd->ram_size -gd->bd->bi_dram[0].size;
+#endif
+}
+
@@ -280,6 +271,40 @@ index 0000000..e08b7a2
+ printf("Armadeus APF27\n");
+ return 0;
+}
++
++int board_eth_init(bd_t * bis)
++{
++#define STR_ENV_ETHADDR "ethaddr"
++ int rc = -ENODEV;
++
++#if defined(CONFIG_FEC_MXC)
++ struct eth_device *dev;
++ uchar eth_addr[6];
++
++ rc = fecmxc_initialize(bis);
++
++ if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
++ dev = eth_get_dev_by_index(0);
++ if (dev) {
++ eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
++ } else {
++ printf("FEC APF27: Couldn't get eth device\n");
++ rc = -1;
++ }
++ }
++#endif
++
++ return rc;
++}
++
++#ifndef CONFIG_SYS_DCACHE_OFF
++void enable_caches(void)
++{
++ /* Enable D-cache. I-cache is already enabled in start.S */
++ //dcache_enable();
++}
++
++#endif
diff --git a/board/armadeus/apf27/config.mk b/board/armadeus/apf27/config.mk
new file mode 100644
index 0000000..3354ba0
@@ -513,14 +538,14 @@ index 0000000..4d72d8c
+ str r1, [r0]
+
+ /* writeb(0xA0001000, any value) */
-+ ldr r1, =CONFIG_SYS_SDRAM_1_BASE+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
++ ldr r1, =PHYS_SDRAM_1+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
+ ldrb r2, [r1]
+
+ /* writel(ESDCTL0, CONFIG_SYS_AUTOREFRESH_CMD) */
+ ldr r1, =CONFIG_SYS_AUTOREFRESH_CMD
+ str r1, [r0]
+
-+ ldr r4, =CONFIG_SYS_SDRAM_1_BASE /* CSD0 base address */
++ ldr r4, =PHYS_SDRAM_1 /* CSD0 base address */
+
+ ldr r6,=0x7 /* load loop counter */
+1: ldr r5,[r4] /* run auto-refresh cycle to array 0 */
@@ -532,11 +557,11 @@ index 0000000..4d72d8c
+ str r1, [r0]
+
+ /* set standard mode register */
-+ ldr r4, = CONFIG_SYS_SDRAM_1_BASE+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
++ ldr r4, = PHYS_SDRAM_1+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
+ ldrb r2, [r4]
+
+ /* set extended mode register */
-+ ldr r4, =CONFIG_SYS_SDRAM_1_BASE+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
++ ldr r4, =PHYS_SDRAM_1+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
+ ldrb r5, [r4]
+
+ /* writel(CONFIG_SYS_PRECHARGE_CMD, CONFIG_SYS_NORMAL_RW_CMD) */
@@ -553,14 +578,14 @@ index 0000000..4d72d8c
+ str r1, [r0]
+
+ /* writeb(0xB0001000, any value) */
-+ ldr r1, =CONFIG_SYS_SDRAM_2_BASE+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
++ ldr r1, =PHYS_SDRAM_2+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
+ ldrb r2, [r1]
+
+ /* writel(ESDCTL1, CONFIG_SYS_AUTOREFRESH_CMD) */
+ ldr r1, =CONFIG_SYS_AUTOREFRESH_CMD
+ str r1, [r0]
+
-+ ldr r4, =CONFIG_SYS_SDRAM_2_BASE /* CSD1 base address */
++ ldr r4, =PHYS_SDRAM_2 /* CSD1 base address */
+
+ ldr r6,=0x7 /* load loop counter */
+1: ldr r5,[r4] /* run auto-refresh cycle to array 0 */
@@ -572,11 +597,11 @@ index 0000000..4d72d8c
+ str r1, [r0]
+
+ /* set standard mode register */
-+ ldr r4, =CONFIG_SYS_SDRAM_2_BASE+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
++ ldr r4, =PHYS_SDRAM_2+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
+ ldrb r2, [r4]
+
+ /* set extended mode register */
-+ ldr r4, =CONFIG_SYS_SDRAM_2_BASE+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
++ ldr r4, =PHYS_SDRAM_2+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
+ ldrb r2, [r4]
+
+ /* writel(ESDCTL1, CONFIG_SYS_NORMAL_RW_CMD) */
@@ -749,7 +774,7 @@ Index: u-boot-2010.03/board/armadeus/apf27/fpga.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2010.03/board/armadeus/apf27/fpga.c 2011-01-05 18:09:44.000000000 +0100
-@@ -0,0 +1,267 @@
+@@ -0,0 +1,269 @@
+/*
+ * (C) Copyright 2002-2008
+ * Eric Jarrige <eri...@ar...>
@@ -1006,12 +1031,14 @@ Index: u-boot-2010.03/board/armadeus/apf27/fpga.c
+ }
+
+ if ((size >= fpga[0].size) && ( autoload ) && (0 == strcmp(autoload, "1"))) {
-+ if (FPGA_SUCCESS != fpga_load( 0, (void *)buffer, size )) {
-+ lout = 1;
++ if (ctrlc()) {
++ printf("Firmware download stopped!\n");
++ } else if (FPGA_SUCCESS != fpga_load( 0,(void *)buffer, size )) {
+ printf("Firmware download failed!\n");
++ } else {
++ printf("Firmware successfully programmed\n");
++ lout = 1;
+ }
-+ else
-+ printf("Firmware successfully programmed\n");
+ }
+ return lout;
+}
diff --git a/patches/u-boot/2011.12/310-apf27-nand-spl.patch b/patches/u-boot/2011.12/310-apf27-nand-spl.patch
index db09282..daa8554 100644
--- a/patches/u-boot/2011.12/310-apf27-nand-spl.patch
+++ b/patches/u-boot/2011.12/310-apf27-nand-spl.patch
@@ -604,14 +604,14 @@ Index: u-boot-2010.03/nand_spl/board/armadeus/apf27/start.S
+ str r1, [r0]
+
+ /* writeb(0xA0001000, any value) */
-+ ldr r1, =CONFIG_SYS_SDRAM_1_BASE+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
++ ldr r1, =PHYS_SDRAM_1+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
+ ldrb r2, [r1]
+
+ /* writel(ESDCTL0, CONFIG_SYS_AUTOREFRESH_CMD) */
+ ldr r1, =CONFIG_SYS_AUTOREFRESH_CMD
+ str r1, [r0]
+
-+ ldr r4, =CONFIG_SYS_SDRAM_1_BASE /* CSD0 base address */
++ ldr r4, =PHYS_SDRAM_1 /* CSD0 base address */
+
+ ldr r6,=0x7 /* load loop counter */
+1: ldr r5,[r4] /* run auto-refresh cycle to array 0 */
@@ -623,11 +623,11 @@ Index: u-boot-2010.03/nand_spl/board/armadeus/apf27/start.S
+ str r1, [r0]
+
+ /* set standard mode register */
-+ ldr r4, = CONFIG_SYS_SDRAM_1_BASE+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
++ ldr r4, = PHYS_SDRAM_1+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
+ ldrb r2, [r4]
+
+ /* set extended mode register */
-+ ldr r4, =CONFIG_SYS_SDRAM_1_BASE+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
++ ldr r4, =PHYS_SDRAM_1+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
+ ldrb r5, [r4]
+
+ /* writel(CONFIG_SYS_PRECHARGE_CMD, CONFIG_SYS_NORMAL_RW_CMD) */
@@ -644,14 +644,14 @@ Index: u-boot-2010.03/nand_spl/board/armadeus/apf27/start.S
+ str r1, [r0]
+
+ /* writeb(0xB0001000, any value) */
-+ ldr r1, =CONFIG_SYS_SDRAM_2_BASE+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
++ ldr r1, =PHYS_SDRAM_2+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
+ ldrb r2, [r1]
+
+ /* writel(ESDCTL1, CONFIG_SYS_AUTOREFRESH_CMD) */
+ ldr r1, =CONFIG_SYS_AUTOREFRESH_CMD
+ str r1, [r0]
+
-+ ldr r4, =CONFIG_SYS_SDRAM_2_BASE /* CSD1 base address */
++ ldr r4, =PHYS_SDRAM_2 /* CSD1 base address */
+
+ ldr r6,=0x7 /* load loop counter */
+1: ldr r5,[r4] /* run auto-refresh cycle to array 0 */
@@ -663,11 +663,11 @@ Index: u-boot-2010.03/nand_spl/board/armadeus/apf27/start.S
+ str r1, [r0]
+
+ /* set standard mode register */
-+ ldr r4, =CONFIG_SYS_SDRAM_2_BASE+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
++ ldr r4, =PHYS_SDRAM_2+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
+ ldrb r2, [r4]
+
+ /* set extended mode register */
-+ ldr r4, =CONFIG_SYS_SDRAM_2_BASE+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
++ ldr r4, =PHYS_SDRAM_2+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
+ ldrb r2, [r4]
+
+ /* writel(ESDCTL1, CONFIG_SYS_NORMAL_RW_CMD) */
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-20 10:46:17
|
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 ea1a9356432018629f5f43b6932f963403335446 (commit)
from 8c7039ae8806030b1eca595fb95ab336ba784a90 (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 ea1a9356432018629f5f43b6932f963403335446
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 20 11:57:01 2012 +0100
[UBOOT] apf51: remove JFFS2 scripts - this board does not support JFFS2
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2011.12.h | 25 ++++++++------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
index 1f64949..3930e2d 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
@@ -28,8 +28,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.6"
-#define CONFIG_IDENT_STRING " apf51 patch 0.8"
+#define CONFIG_ENV_VERSION "0.7"
+#define CONFIG_IDENT_STRING " apf51 patch 0.9"
/*
* High Level Configuration Options
@@ -62,7 +62,7 @@
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTARGS \
- CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
+ CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
#define CONFIG_CONSOLE "console=ttymxc2,"MK_STR(CONFIG_BAUDRATE)
#define CONFIG_MTDMAP "mxc_nand"
@@ -97,8 +97,6 @@
"quiet=1\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
- "addjffsargs=setenv bootargs ${bootargs} " \
- "root=/dev/mtdblock4 rootfstype=jffs2\0" \
"addubifsargs=setenv bootargs ${bootargs} " \
"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
"addmmcargs=setenv bootargs ${bootargs} " \
@@ -108,26 +106,23 @@
"${hostname}:eth0:off\0" \
"nfsboot=setenv bootargs ${console} ${mtdparts};" \
"run addnfsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 90800000 0 ${kernel_offset}\0" \
- "jffsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addjffsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 90800000 0 ${kernel_offset}\0" \
+ "nboot 90800000 0 ${kernel_offset}\0" \
"ubifsboot=setenv bootargs ${console} ${mtdparts};" \
"run addubifsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 90800000 0 ${kernel_offset}\0" \
+ "nboot 90800000 0 ${kernel_offset}\0" \
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 90800000 0 ${kernel_offset}\0" \
+ "nboot 90800000 0 ${kernel_offset}\0" \
"firmware_autoload=0\0" \
"flash_uboot=nand unlock ${uboot_offset} ${uboot_len};" \
"nand erase ${uboot_offset} ${uboot_len};" \
- "if nand write.jffs2 ${fileaddr} ${uboot_offset} ${filesize};" \
+ "if nand write.trimffs ${fileaddr} ${uboot_offset} ${filesize};" \
"then nand lock; nand unlock ${env_offset};" \
"echo Flashing of uboot succeed;" \
"else echo Flashing of uboot failed;" \
"fi; \0" \
"flash_firmware=nand erase ${firmware_offset} ${firmware_len};" \
- "if nand write.jffs2 ${fileaddr} ${firmware_offset}" \
+ "if nand write.trimffs ${fileaddr} ${firmware_offset}" \
" ${filesize};" \
"then echo Flashing of Firmware succeed;" \
"else echo Flashing of Firmware failed;" \
@@ -136,12 +131,12 @@
"run flash_firmware;" \
"fpga load 0 ${fileaddr} ${firmware_len};\0" \
"flash_kernel=nand erase ${kernel_offset} ${kernel_len};" \
- "if nand write.jffs2 ${fileaddr} ${kernel_offset} ${filesize};"\
+ "if nand write.trimffs ${fileaddr} ${kernel_offset} ${filesize};"\
"then echo Flashing of kernel succeed;" \
"else echo Flashing of kernel failed;" \
"fi\0" \
"flash_rootfs=nand erase.part rootfs;" \
- "if nand write.jffs2 ${fileaddr} ${rootfs_offset} ${filesize};"\
+ "if nand write.trimffs ${fileaddr} ${rootfs_offset} ${filesize};"\
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-19 23:56:33
|
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 8c7039ae8806030b1eca595fb95ab336ba784a90 (commit)
from 21c44ef86e5b3145584bd3bfbb5e386fe5e30526 (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 8c7039ae8806030b1eca595fb95ab336ba784a90
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 20 01:07:15 2012 +0100
[UBOOT] apf51: bump to U-Boot 2011.12
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 8 ++++----
buildroot/configs/apf51test_defconfig | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index c797a38..8042772 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -75,11 +75,11 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2010.03.h"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2010.03.h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
+BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2010.03.tar.bz2"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2010.03"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_LINUX_KERNEL=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 9914ab9..1c7c29c 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -150,11 +150,11 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2010.03.h"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2010.03.h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
+BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2010.03.tar.bz2"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2010.03"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_LINUX_KERNEL=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-19 23:32:32
|
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 21c44ef86e5b3145584bd3bfbb5e386fe5e30526 (commit)
from e37ec54346c729798efc556478aecbdf29bd6be9 (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 21c44ef86e5b3145584bd3bfbb5e386fe5e30526
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 20 00:43:13 2012 +0100
[UBOOT] apf9328: bump to U-Boot 2011.12
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf9328_defconfig | 8 ++++----
buildroot/configs/apf9328test_defconfig | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 2184474..58063e2 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -58,11 +58,11 @@ BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_JFFS2=y
BR2_TARGET_ROOTFS_JFFS2_PAD=y
BR2_TARGET_UBOOT=y
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-1.3.4.h"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-1.3.4.h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
+BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-1.3.4.tar.bz2"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/1.3.4"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_LINUX_KERNEL=y
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 206bc29..5070ade 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -101,11 +101,11 @@ BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_JFFS2=y
BR2_TARGET_ROOTFS_JFFS2_PAD=y
BR2_TARGET_UBOOT=y
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-1.3.4.h"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-1.3.4.h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
+BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-1.3.4.tar.bz2"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/1.3.4"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_LINUX_KERNEL=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-19 21:12:24
|
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 e37ec54346c729798efc556478aecbdf29bd6be9 (commit)
via bbbeb453f1e6a4a5cea71cad04de0eeabcd9e759 (commit)
via a994fca17afa41b03a218f292bff0b44e8d4049f (commit)
from 65ad8807bdebe74c960124e5650551fce8a4eb76 (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 e37ec54346c729798efc556478aecbdf29bd6be9
Merge: bbbeb45 65ad880
Author: Eric Jarrige <eri...@ar...>
Date: Mon Mar 19 22:23:07 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit bbbeb453f1e6a4a5cea71cad04de0eeabcd9e759
Author: Eric Jarrige <eri...@ar...>
Date: Mon Mar 19 22:22:14 2012 +0100
[UBOOT] apf51: check <ctrl>-c on boot to cancel fpga download
commit a994fca17afa41b03a218f292bff0b44e8d4049f
Author: Eric Jarrige <eri...@ar...>
Date: Mon Mar 19 22:21:26 2012 +0100
[UBOOT] apf9328: check <ctrl>-c on boot to cancel fpga download
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2011.12/03-apf9328.patch | 12 +++++++---
patches/u-boot/2011.12/401-apf51.patch | 6 +++-
software/uboot_recover/apf51_recover.py | 33 +++++++++++++++----------------
3 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/patches/u-boot/2011.12/03-apf9328.patch b/patches/u-boot/2011.12/03-apf9328.patch
index d1abe33..752743b 100644
--- a/patches/u-boot/2011.12/03-apf9328.patch
+++ b/patches/u-boot/2011.12/03-apf9328.patch
@@ -197,7 +197,7 @@ Index: u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
===================================================================
--- /dev/null
+++ u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
-@@ -0,0 +1,89 @@
+@@ -0,0 +1,93 @@
+/*
+ * (C) Copyright 2005-2011
+ * Nicolas Colombin <th...@us...>
@@ -277,13 +277,17 @@ Index: u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
+ }
+
+ if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+ if (FPGA_SUCCESS != fpga_load(0, (void *)CONFIG_FIRMWARE_ADDR,
-+ (size_t) CONFIG_FIRMWARE_LEN)) {
++ if (ctrlc()) {
++ printf("Firmware download stopped!\n");
++ lout = 0;
++ } else if (FPGA_SUCCESS != fpga_load(0,
++ (void *)CONFIG_FIRMWARE_ADDR,
++ (size_t) CONFIG_FIRMWARE_LEN)) {
+ lout = 0;
+ printf("Firmware not loaded!\n");
+ }
+ }
-+ return 1;
++ return lout;
+}
+
+#endif /* CONFIG_FPGA */
diff --git a/patches/u-boot/2011.12/401-apf51.patch b/patches/u-boot/2011.12/401-apf51.patch
index 9818093..5ef9f71 100644
--- a/patches/u-boot/2011.12/401-apf51.patch
+++ b/patches/u-boot/2011.12/401-apf51.patch
@@ -2,7 +2,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-custom/board/armadeus/apf51/apf51.c 2012-01-12 17:19:58.434303119 +0100
-@@ -0,0 +1,1242 @@
+@@ -0,0 +1,1244 @@
+/*
+ * (C) Copyright 2010-2012 Eric Jarrige, Armadeus Project
+ *
@@ -975,7 +975,9 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ if ((s = getenv("firmware_len")) != NULL) {
+ end = offset + simple_strtoul(s, NULL, 16);
+ }
-+ if ((-1 != offset) && (offset != end)) {
++ if (ctrlc()) {
++ printf("Firmware download stopped!\n");
++ } else if ((-1 != offset) && (offset != end)) {
+ size = read_firmware(offset, end, firmware_buffer);
+ }
+ }
diff --git a/software/uboot_recover/apf51_recover.py b/software/uboot_recover/apf51_recover.py
index 9e31cdd..85778b4 100644
--- a/software/uboot_recover/apf51_recover.py
+++ b/software/uboot_recover/apf51_recover.py
@@ -412,7 +412,6 @@ class UBoot:
def __getOutput(self, error_msg=None):
""" This function waits for U-Boot answer and returns it"""
- #debugser = serial.Serial("/dev/tty0",115200,timeout=1)
response = ""
while not re.search(r'BIOS>', response):
char = self.serial.read(1)
@@ -422,23 +421,23 @@ class UBoot:
if error_msg!=None:
if re.search(error_msg,response):
raise Error("getOutput error")
-
- sys.stdout.write(response)
- #debugser.write(char)
- #debugser.close()
+ #sys.stdout.write(char)
return response
def resetEnv(self):
+ self.serial.flushInput()
self.serial.write("run flash_reset_env\n")
return self.__getOutput()
def waitForPrompt(self):
- time.sleep(1)
- self.serial.write("\n")
+ self.serial.write("\003")
+ while not self.serial.inWaiting():
+ self.serial.write("\003")
return self.__getOutput()
def flash(self):
""" Ask U-Boot to flash itself """
+ self.serial.flushInput()
self.serial.write("run flash_uboot\n")
try:
ret = self.__getOutput()
@@ -537,6 +536,16 @@ if __name__ == "__main__":
if port is '':
port = '/dev/ttyACM0'
+ try:
+ ser = serial.Serial(port, SPEED, timeout=2)
+ except Exception, msg:
+ print "unable to open serial port %s !" % port
+ print msg
+ sys.exit()
+ ser.flush()
+
+ uboot = UBoot(ser)
+
usb = USBDevice()
apfBootloader = apf51Bootloader(usb)
@@ -554,16 +563,6 @@ if __name__ == "__main__":
print "Loading %s, size = %d bytes" % (BINARY, os.path.getsize(BINARY))
apfBootloader.download("90000000", BINARY, fsize, "AA")
- try:
- ser = serial.Serial(port, SPEED, timeout=2)
- except Exception, msg:
- print "unable to open serial port %s !" % port
- print msg
- sys.exit()
- ser.flush()
-
- uboot = UBoot(ser)
-
# execute loaded code:
apfBootloader.put("90000000", "90000004", "l")
#self.bootstrap.getStatus() ?
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2012-03-19 18:09:48
|
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 65ad8807bdebe74c960124e5650551fce8a4eb76 (commit)
via 0df1448d8eeddde93d60be9ca30748db4ddb3f25 (commit)
via 2a4f0de38dd38830694234f941071b50f144e37a (commit)
via c1a99f7f5803c7ab995b96d34982a51c9f61af5a (commit)
via d64a2f6492a391eafb1bb7a12947cedaab9a9c91 (commit)
via 7ca2789f4b298905c28441b1d107f147be67477b (commit)
via de9dacf42b6c126baaf8ccd0d6574c06ed21eb82 (commit)
via 9e19ddc09c7ca2c87cd2c88bc07f93c48f009421 (commit)
from 82bc2886a327e6d5e80645b9a74bcdba7fdc7515 (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 65ad8807bdebe74c960124e5650551fce8a4eb76
Merge: 0df1448 82bc288
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 19:02:57 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 0df1448d8eeddde93d60be9ca30748db4ddb3f25
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 19:02:32 2012 +0100
[linux][apf51] bitrate is defined under board-apf51 not in devboard
commit 2a4f0de38dd38830694234f941071b50f144e37a
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 18:59:21 2012 +0100
[linux] fix i2c clock bug
commit c1a99f7f5803c7ab995b96d34982a51c9f61af5a
Merge: d64a2f6 d9ebdaf
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 17:07:08 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d64a2f6492a391eafb1bb7a12947cedaab9a9c91
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 17:06:27 2012 +0100
Revert "[linux][apf51] i2c bitrate is declared in board_apf51.c"
This reverts commit 9e19ddc09c7ca2c87cd2c88bc07f93c48f009421.
commit 7ca2789f4b298905c28441b1d107f147be67477b
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 17:05:58 2012 +0100
Revert "Revert "[BUILD] Add Buildroot version to build infos""
This reverts commit de9dacf42b6c126baaf8ccd0d6574c06ed21eb82.
commit de9dacf42b6c126baaf8ccd0d6574c06ed21eb82
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 17:05:17 2012 +0100
Revert "[BUILD] Add Buildroot version to build infos"
This reverts commit 2f02a624997a86fe947bc40f842a69c3fa336e0a.
commit 9e19ddc09c7ca2c87cd2c88bc07f93c48f009421
Author: Fabien Marteau <fab...@ar...>
Date: Mon Mar 19 17:02:35 2012 +0100
[linux][apf51] i2c bitrate is declared in board_apf51.c
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch | 14 +++++++++++
.../408-armadeus-add_apf51-dev_baseboard.patch | 24 ++++++++-----------
2 files changed, 24 insertions(+), 14 deletions(-)
create mode 100644 patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
diff --git a/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch b/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
new file mode 100644
index 0000000..a524651
--- /dev/null
+++ b/patches/linux/2.6.38/359-armadeus-imx-fix_clock_on_i2c.patch
@@ -0,0 +1,14 @@
+Index: linux-2.6.38.8/drivers/i2c/busses/i2c-imx.c
+===================================================================
+--- linux-2.6.38.8.orig/drivers/i2c/busses/i2c-imx.c 2012-03-19 18:50:33.000000000 +0100
++++ linux-2.6.38.8/drivers/i2c/busses/i2c-imx.c 2012-03-19 18:51:16.000000000 +0100
+@@ -248,7 +248,8 @@
+ int i;
+
+ /* Divider value calculation */
+- i2c_clk_rate = clk_get_rate(i2c_imx->clk);
++ //i2c_clk_rate = clk_get_rate(i2c_imx->clk);
++ i2c_clk_rate = 10200000; //XXX: there is an error in clk tree
+ div = (i2c_clk_rate + rate - 1) / rate;
+ if (div < i2c_clk_div[0][0])
+ i = 0;
diff --git a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index eabb69a..d317315 100644
--- a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -2,11 +2,11 @@ Add APF51Dev baseboard support.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
+Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-07-07 16:43:36.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-07-07 17:02:20.000000000 +0200
-@@ -174,4 +174,27 @@
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2012-03-19 18:51:31.000000000 +0100
++++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2012-03-19 19:01:08.000000000 +0100
+@@ -175,4 +175,27 @@
Include support for Armadeus systems APF51 System On Module. This
includes specific configurations for the board and its peripherals.
@@ -34,10 +34,10 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
+endchoice
+
endif
-Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
+Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-07-07 16:43:36.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-07-07 17:02:20.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile 2012-03-19 18:51:31.000000000 +0100
++++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile 2012-03-19 19:01:08.000000000 +0100
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -46,11 +46,11 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
-Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-07-07 16:53:13.000000000 +0200
-@@ -0,0 +1,504 @@
++++ linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c 2012-03-19 19:01:24.000000000 +0100
+@@ -0,0 +1,500 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -233,10 +233,6 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
+ .flags = IMXUART_HAVE_RTSCTS,
+};
+
-+static const struct imxi2c_platform_data apf51dev_i2c_data __initconst = {
-+ .bitrate = 400000,
-+};
-+
+/* APF51Proto has a LCD connector for a 18 bits 800x480 Chimei TFT LCD */
+static struct fb_videomode apf51dev_modes[] = {
+ {
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-19 17:50:46
|
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 82bc2886a327e6d5e80645b9a74bcdba7fdc7515 (commit)
via ccea75b0600d7bfa63b45d7bedb04e3910f44bc7 (commit)
from 8597662cf9066ee78c13eac3a030560fc8ddab0c (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 82bc2886a327e6d5e80645b9a74bcdba7fdc7515
Merge: ccea75b 8597662
Author: Eric Jarrige <eri...@ar...>
Date: Mon Mar 19 19:01:22 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit ccea75b0600d7bfa63b45d7bedb04e3910f44bc7
Author: Eric Jarrige <eri...@ar...>
Date: Mon Mar 19 19:00:53 2012 +0100
[UBOOT] apf28: fix NAND rootfs
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index aeb6a1b..a18a099 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -26,8 +26,8 @@
#include <asm/arch/regs-base.h>
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.4"
-#define CONFIG_IDENT_STRING " apf28 patch 0.6"
+#define CONFIG_ENV_VERSION "0.5"
+#define CONFIG_IDENT_STRING " apf28 patch 0.7"
/*
* SoC configurations
@@ -284,7 +284,7 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
-#define CONFIG_BOOTDELAY -1
+#define CONFIG_BOOTDELAY 5
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTFILE MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
#define CONFIG_BOOTARGS \
@@ -327,31 +327,31 @@
"${hostname}:eth0:off\0" \
"nfsboot=setenv bootargs ${console} ${mtdparts};" \
"run addnfsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 40800000 0 ${kernel_offset}\0" \
+ "nboot 40800000 0 ${kernel_offset}\0" \
"ubifsboot=setenv bootargs ${console} ${mtdparts};" \
"run addubifsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 40800000 0 ${kernel_offset}\0" \
+ "nboot 40800000 0 ${kernel_offset}\0" \
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 40800000 0 ${kernel_offset}\0" \
+ "nboot 40800000 0 ${kernel_offset}\0" \
"flash_uboot=nand unlock;" \
"if bcb nand.write ; then " \
"nand erase ${uboot_offset} ${uboot_len} ; " \
- "nand write ${fileaddr} ${uboot_offset} ${filesize};" \
+ "nand write.trimffs ${fileaddr} ${uboot_offset} ${filesize};" \
"nand erase ${uboot2_offset} ${uboot_len};" \
- "if nand write ${fileaddr} ${uboot2_offset} ${filesize};" \
+ "if nand write.trimffs ${fileaddr} ${uboot2_offset} ${filesize};"\
"then nand lock; nand unlock ${env_offset};" \
"echo Flashing of uboot succeed;" \
"else echo Flashing of uboot failed;" \
"fi; " \
"fi; \0" \
"flash_kernel=nand erase ${kernel_offset} ${kernel_len};" \
- "if nand write.jffs2 ${fileaddr} ${kernel_offset} ${filesize};"\
+ "if nand write.trimffs ${fileaddr} ${kernel_offset} ${filesize};"\
"then echo Flashing of kernel succeed;" \
"else echo Flashing of kernel failed;" \
"fi\0" \
"flash_rootfs=nand erase.part rootfs;" \
- "if nand write.jffs2 ${fileaddr} ${rootfs_offset} ${filesize};"\
+ "if nand write.trimffs ${fileaddr} ${rootfs_offset} ${filesize};"\
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2012-03-19 17:46:14
|
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 8597662cf9066ee78c13eac3a030560fc8ddab0c (commit)
via 2c7ea42ae527cd97566e63eed87bb974031393d5 (commit)
via 2f8f7600e484c2a3fc241ac09d9113127296147a (commit)
from 66cf2713e93d3a179dd126f306ca79bdc9606de9 (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 8597662cf9066ee78c13eac3a030560fc8ddab0c
Merge: 2c7ea42 66cf271
Author: nicolas <nicolas@nicolas-Studio-1558.(none)>
Date: Mon Mar 19 18:45:27 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 2c7ea42ae527cd97566e63eed87bb974031393d5
Author: nicolas <nicolas@nicolas-Studio-1558.(none)>
Date: Mon Mar 19 18:45:10 2012 +0100
[LINUX] add APF28dev USB_OTG support
commit 2f8f7600e484c2a3fc241ac09d9113127296147a
Author: nicolas <nicolas@nicolas-Studio-1558.(none)>
Date: Mon Mar 19 09:08:35 2012 +0100
[U-BOOT] fix partition sizes of APF28
-----------------------------------------------------------------------
Summary of changes:
...1-armadeus-add_apf28dev_baseboard_support.patch | 10 ++-
.../452-armadeus-mxs-fixes_freescale_bsp.patch | 93 ++++++++++++++++++++
2 files changed, 102 insertions(+), 1 deletions(-)
diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index 331017e..3bc0ee7 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -45,7 +45,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c 2012-02-15 15:51:09.000000000 +0100
-@@ -0,0 +1,313 @@
+@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2012 Armadeus systems
+ *
@@ -98,6 +98,14 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ .data = 0,
+ .output = 1,
+ },
++ /* USB OTG ID */
++ {
++ .name = "USB_ID",
++ .id = PINID_PWM2,
++ .fun = PIN_GPIO,
++ .data = 0,
++ .output = 0,
++ },
+#if defined(CONFIG_FB_MXS) || defined(CONFIG_FB_MXS_MODULE)
+ {
+ .name = "LCD_D00",
diff --git a/patches/linux/2.6.35/452-armadeus-mxs-fixes_freescale_bsp.patch b/patches/linux/2.6.35/452-armadeus-mxs-fixes_freescale_bsp.patch
index 9be0eb6..d286f8f 100644
--- a/patches/linux/2.6.35/452-armadeus-mxs-fixes_freescale_bsp.patch
+++ b/patches/linux/2.6.35/452-armadeus-mxs-fixes_freescale_bsp.patch
@@ -76,3 +76,96 @@ Index: linux-2.6.35.3/drivers/input/touchscreen/mxs-ts.c
+MODULE_DESCRIPTION("MXS input touchscreen driver");
+MODULE_AUTHOR("Vitaly Wool <vi...@em...>");
+MODULE_LICENSE("GPL v2");
+Index: linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c
+===================================================================
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/usb_dr.c 2012-02-03 12:57:41.000000000 +0100
++++ linux-2.6.35.3/arch/arm/mach-mx28/usb_dr.c 2012-02-03 12:57:55.000000000 +0100
+@@ -29,11 +29,19 @@
+ #include <mach/arc_otg.h>
+ #include "usb.h"
+ #include "mx28_pins.h"
++
++#if defined(CONFIG_MACH_MX28EVK)
+ #define USB_POWER_ENABLE MXS_PIN_TO_GPIO(PINID_AUART2_TX)
++#define USB_OTG_ID MXS_PIN_TO_GPIO(PINID_AUART2_TX)
++#else
++#define USB_POWER_ENABLE MXS_PIN_TO_GPIO(PINID_LCD_D23)
++#define USB_OTG_ID MXS_PIN_TO_GPIO(PINID_PWM2)
++#endif
+
+ extern int clk_get_usecount(struct clk *clk);
+ static struct clk *usb_clk;
+ static struct clk *usb_phy_clk;
++static int otg_mode_host = -1;
+
+ void fsl_phy_usb_utmi_init(struct fsl_xcvr_ops *this)
+ {
+@@ -52,14 +60,20 @@ void fsl_phy_usb_utmi_uninit(struct fsl_
+ void fsl_phy_set_power(struct fsl_xcvr_ops *this,
+ struct fsl_usb2_platform_data *pdata, int on)
+ {
+-#if defined(CONFIG_MACH_MX28EVK)
+- /* USB_POWER_ENABLE_PIN have request at pin init*/
+- if (pdata->phy_regs != USBPHY1_PHYS_ADDR) {
+- pr_debug("%s: on is %d\n", __func__, on);
+- gpio_direction_output(USB_POWER_ENABLE, on);
+- gpio_set_value(USB_POWER_ENABLE, on);
++ if (otg_mode_host == 1){
++ gpio_direction_output(USB_POWER_ENABLE, 1);
++ gpio_set_value(USB_POWER_ENABLE, 1);
++ } else if (otg_mode_host == 0){
++ gpio_direction_output(USB_POWER_ENABLE, 0);
++ gpio_set_value(USB_POWER_ENABLE, 0);
++ } else {
++ /* USB_POWER_ENABLE_PIN have request at pin init*/
++ if (pdata->phy_regs != USBPHY1_PHYS_ADDR) {
++ pr_debug("%s: on is %d\n", __func__, on);
++ gpio_direction_output(USB_POWER_ENABLE, on);
++ gpio_set_value(USB_POWER_ENABLE, on);
++ }
+ }
+-#endif
+ }
+
+ static void usb_host_phy_resume(struct fsl_usb2_platform_data *plat)
+@@ -359,6 +373,7 @@ static struct fsl_usb2_platform_data __m
+ .platform_resume = usb_host_phy_resume,
+ .transceiver = "utmi",
+ .phy_regs = USBPHY0_PHYS_ADDR,
++ .id_gpio = USB_OTG_ID,
+ };
+
+ /*
+@@ -453,6 +468,18 @@ static struct fsl_usb2_wakeup_platform_d
+ .usb_clock_for_pm = usbotg_clock_gate,
+ };
+
++static int __init apf28_otg_mode(char *options)
++{
++ if (!strcmp(options, "host"))
++ otg_mode_host = 1;
++ else if (!strcmp(options, "device"))
++ otg_mode_host = 0;
++
++ return 0;
++}
++__setup("otg_mode=", apf28_otg_mode);
++
++
+ static int __init usb_dr_init(void)
+ {
+ struct platform_device *pdev;
+@@ -468,6 +495,13 @@ static int __init usb_dr_init(void)
+ dr_utmi_config.irq_delay = 0;
+ dr_utmi_config.wakeup_pdata = &usbdr_wakeup_config;
+
++ if (otg_mode_host == 1) { /*mode defined by bootloader options*/
++ printk("OTG mode forced to HOST\n");
++ dr_utmi_config.id_gpio = 0; /* do not manage the ID pin */
++ gpio_direction_output(USB_POWER_ENABLE, 1);
++ gpio_set_value(USB_POWER_ENABLE, 1);
++ }
++
+ if (platform_device_register(&dr_otg_device))
+ printk(KERN_ERR "usb DR: can't register otg device\n");
+ else {
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-03-19 17:26:54
|
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 66cf2713e93d3a179dd126f306ca79bdc9606de9 (commit)
via 35c3b1e0ea8543dbaee0a27f2b515fc59603342a (commit)
from d9ebdafc9f402ec241f085573fb52837833185dc (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 66cf2713e93d3a179dd126f306ca79bdc9606de9
Merge: 35c3b1e d9ebdaf
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Mar 19 18:26:31 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 35c3b1e0ea8543dbaee0a27f2b515fc59603342a
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Mar 19 18:25:48 2012 +0100
[BUILDROOT] Fix QWT patch Qt directory variable.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2012.02/133-qwt-add_package.patch | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/patches/buildroot/2012.02/133-qwt-add_package.patch b/patches/buildroot/2012.02/133-qwt-add_package.patch
index c0860ab..8d2d1a9 100644
--- a/patches/buildroot/2012.02/133-qwt-add_package.patch
+++ b/patches/buildroot/2012.02/133-qwt-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:45:49.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:45:52.000000000 +0100
+--- buildroot.orig/package/Config.in 2012-03-16 17:30:27.000000000 +0100
++++ buildroot/package/Config.in 2012-03-19 18:24:10.000000000 +0100
@@ -140,6 +140,7 @@
comment "other GUIs"
source "package/efl/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/qwt/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/Config.in 2012-02-21 16:45:52.000000000 +0100
++++ buildroot/package/qwt/Config.in 2012-03-19 15:48:04.000000000 +0100
@@ -0,0 +1,20 @@
+comment "Qwt requires Qt to be installed"
+ depends on !BR2_PACKAGE_QT
@@ -42,7 +42,7 @@ Index: buildroot/package/qwt/Config.in
Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2012-02-21 16:45:52.000000000 +0100
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2012-03-19 15:48:04.000000000 +0100
@@ -0,0 +1,30 @@
+--- qwt-5.2.1/qwtconfig.pri.orig 2010-09-28 14:34:01.000000000 +0200
++++ qwt-5.2.1/qwtconfig.pri 2010-09-28 15:37:02.000000000 +0200
@@ -77,7 +77,7 @@ Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
Index: buildroot/package/qwt/qwt.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt.mk 2012-02-21 16:45:52.000000000 +0100
++++ buildroot/package/qwt/qwt.mk 2012-03-19 18:24:33.000000000 +0100
@@ -0,0 +1,82 @@
+######################################################################
+#
@@ -92,7 +92,7 @@ Index: buildroot/package/qwt/qwt.mk
+QWT_TARGET_DIR:=$(BUILD_DIR)/qwt-$(QWT_VERSION)
+QWT_CONFIG_FILE:=qwt.pro
+QWT_EXAMPLES_CONFIG_FILE:=examples.pro
-+QT_DIR:=$(HOST_DIR)/usr
++QT_HOST_DIR:=$(HOST_DIR)/usr
+
+$(DL_DIR)/$(QWT_SOURCE):
+ $(call DOWNLOAD,$(QWT_SITE),$(QWT_SOURCE))
@@ -125,7 +125,7 @@ Index: buildroot/package/qwt/qwt.mk
+
+$(QWT_TARGET_DIR)/examples/.configured:
+ -[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
-+ $(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
++ $(QT_HOST_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
+ touch $@
+
+$(QWT_TARGET_DIR)/examples/.compiled: $(QWT_TARGET_DIR)/examples/.configured
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-03-19 15:55:28
|
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 d9ebdafc9f402ec241f085573fb52837833185dc (commit)
from c10b3e4d29b40e1a9d7f9609c488a8aced8eb87d (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 d9ebdafc9f402ec241f085573fb52837833185dc
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 19 16:47:47 2012 +0100
[DEBUG] Add i.MX51/53 CSI registers to imxregs
-----------------------------------------------------------------------
Summary of changes:
target/linux/debug/imxregs/imx51regs.h | 35 ++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/target/linux/debug/imxregs/imx51regs.h b/target/linux/debug/imxregs/imx51regs.h
index 4c4f9f8..b658853 100644
--- a/target/linux/debug/imxregs/imx51regs.h
+++ b/target/linux/debug/imxregs/imx51regs.h
@@ -1,7 +1,7 @@
/*
- * imx51regs.h - i.MX51 registers definition
+ * imx5xregs.h - i.MX5x registers definition
*
- * Copyright (C) 2010 armadeus systems
+ * Copyright (C) 2010-2012 armadeus systems
* Derivated from pxaregs (c) Copyright 2002 by M&N Logistik-Loesungen Online GmbH
* Author: Julien Boibessot
*
@@ -23,10 +23,41 @@
#include "definitions.h"
+#ifdef IMX51
#define IMX_TYPE "i.MX51"
+#define CSI0_BASE(x) (0x5e030000 + x)
+#define CSI1_BASE(x) (0x5e038000 + x)
+#else
+#define IMX_TYPE "i.MX53"
+#define CSI0_BASE(x) (0x1e030000 + x)
+#define CSI1_BASE(x) (0x1e038000 + x)
+#endif
static struct reg_info regs[] =
{
+/* IPU */
+{ "CSI0_SENS_CONF", CSI0_BASE(0x00), 0, 0xffffffff, 'x', "CSI0 Sensor Configuration Register" },
+{ "CSI0_SENS_FRM_SIZE", CSI0_BASE(0x04), 0, 0xffffffff, 'x', "CSI0 Sensor Frame Size Register" },
+{ "CSI0_ACT_FRM_SIZE", CSI0_BASE(0x08), 0, 0xffffffff, 'x', "CSI0 Actual Frame Size Register" },
+{ "CSI0_OUT_FRM_CTRL", CSI0_BASE(0x0c), 0, 0xffffffff, 'x', "CSI0 Output Control Register" },
+{ "CSI0_TST_CTRL", CSI0_BASE(0x10), 0, 0xffffffff, 'x', "CSI0 Test Control Register" },
+{ "CSI0_CCIR_CODE_1", CSI0_BASE(0x14), 0, 0xffffffff, 'x', "CSI0 CCIR Code Register 1" },
+{ "CSI0_CCIR_CODE_2", CSI0_BASE(0x18), 0, 0xffffffff, 'x', "CSI0 CCIR Code Register 2" },
+{ "CSI0_CCIR_CODE_3", CSI0_BASE(0x1c), 0, 0xffffffff, 'x', "CSI0 CCIR Code Register 3" },
+{ "CSI0_DI", CSI0_BASE(0x20), 0, 0xffffffff, 'x', "CSI0 Data Identifier Register" },
+{ "CSI0_SKIP", CSI0_BASE(0x24), 0, 0xffffffff, 'x', "CSI0 Skip Register" },
+{ "CSI0_CPD_CTRL", CSI0_BASE(0x28), 0, 0xffffffff, 'x', "CSI0 Compander Control Register" },
+{ "CSI1_SENS_CONF", CSI1_BASE(0x00), 0, 0xffffffff, 'x', "CSI1 Sensor Configuration Register" },
+{ "CSI1_SENS_FRM_SIZE", CSI1_BASE(0x04), 0, 0xffffffff, 'x', "CSI1 Sensor Frame Size Register" },
+{ "CSI1_ACT_FRM_SIZE", CSI1_BASE(0x08), 0, 0xffffffff, 'x', "CSI1 Actual Frame Size Register" },
+{ "CSI1_OUT_FRM_CTRL", CSI1_BASE(0x0c), 0, 0xffffffff, 'x', "CSI1 Output Control Register" },
+{ "CSI1_TST_CTRL", CSI1_BASE(0x10), 0, 0xffffffff, 'x', "CSI1 Test Control Register" },
+{ "CSI1_CCIR_CODE_1", CSI1_BASE(0x14), 0, 0xffffffff, 'x', "CSI1 CCIR Code Register 1" },
+{ "CSI1_CCIR_CODE_2", CSI1_BASE(0x18), 0, 0xffffffff, 'x', "CSI1 CCIR Code Register 2" },
+{ "CSI1_CCIR_CODE_3", CSI1_BASE(0x1c), 0, 0xffffffff, 'x', "CSI1 CCIR Code Register 3" },
+{ "CSI1_DI", CSI1_BASE(0x20), 0, 0xffffffff, 'x', "CSI1 Data Identifier Register" },
+{ "CSI1_SKIP", CSI1_BASE(0x24), 0, 0xffffffff, 'x', "CSI1 Skip Register" },
+{ "CSI1_CPD_CTRL", CSI1_BASE(0x28), 0, 0xffffffff, 'x', "CSI1 Compander Control Register" },
/* CCM */
{ "CCR", 0x73fd4000, 0, 0xffffffff, 'x', "CCM Control Register" },
{ "CCDR", 0x73fd4004, 0, 0xffffffff, 'x', "CCM Control Divider Register" },
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-03-19 13:53:03
|
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 c10b3e4d29b40e1a9d7f9609c488a8aced8eb87d (commit)
from 156e8992077fab544f626c2fb10f2517f2c5e0e0 (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 c10b3e4d29b40e1a9d7f9609c488a8aced8eb87d
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 19 14:52:19 2012 +0100
[BUILD] Factorizes forced linux rebuild by using new BR target
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 12cbacf..58b9ff7 100644
--- a/Makefile
+++ b/Makefile
@@ -139,8 +139,7 @@ ifeq ($(BUILDROOT_VERSION),2011.05)
@-touch $(ARMADEUS_LINUX_DIR)/.config
@$(MAKE) -C $(BUILDROOT_DIR) $@
else
- @rm -f $(ARMADEUS_LINUX_DIR)/.stamp_built $(ARMADEUS_LINUX_DIR)/.stamp_images_installed
- @$(MAKE) -C $(BUILDROOT_DIR) linux
+ @$(MAKE) -C $(BUILDROOT_DIR) linux-rebuild
endif
linux26-clean linux-clean: $(BUILDROOT_DIR)/.configured
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-03-19 11:26:46
|
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 156e8992077fab544f626c2fb10f2517f2c5e0e0 (commit)
from 7902a58ba7e963e15ebde5e5fae24ff0c22ab0cf (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 156e8992077fab544f626c2fb10f2517f2c5e0e0
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 19 12:25:28 2012 +0100
[BUILD] Make forced linux rebuild also copy resulting images to output/images/
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 3b61d85..12cbacf 100644
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,7 @@ ifeq ($(BUILDROOT_VERSION),2011.05)
@-touch $(ARMADEUS_LINUX_DIR)/.config
@$(MAKE) -C $(BUILDROOT_DIR) $@
else
- @rm -f $(ARMADEUS_LINUX_DIR)/.stamp_built
+ @rm -f $(ARMADEUS_LINUX_DIR)/.stamp_built $(ARMADEUS_LINUX_DIR)/.stamp_images_installed
@$(MAKE) -C $(BUILDROOT_DIR) linux
endif
hooks/post-receive
--
armadeus
|
