armadeus-commitlog Mailing List for armadeus (Page 78)
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-04-03 16:21: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 96c7dde3124d6c778350816b6965347c837221a4 (commit)
via 024eb5e6b07cd91ce85701c565bb9bfda35f5153 (commit)
via 75444ee9508569748dc8e2ed1d2caa5002710dcb (commit)
from 7f8705fc422e80887e229bc05c3f800d8658e2e4 (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 96c7dde3124d6c778350816b6965347c837221a4
Merge: 024eb5e 7f8705f
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 3 18:32:56 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 024eb5e6b07cd91ce85701c565bb9bfda35f5153
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 3 18:31:04 2012 +0200
[BUILDROOT] Change BR specific patches for UBoot to be a hook command in the armadeus makefiles
commit 75444ee9508569748dc8e2ed1d2caa5002710dcb
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 3 18:23:17 2012 +0200
[BUILDROOT] Change BR specific patches for UBoor to be a hook command in the armadeus makefiles
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Makefile.in | 21 ++++++++++++++++
...d_possibility_to_choose_board_header_file.patch | 25 --------------------
...madeus_specific_options_for_config_header.patch | 24 -------------------
3 files changed, 21 insertions(+), 49 deletions(-)
delete mode 100644 patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 3b69cfc..6bd55ea 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -9,6 +9,27 @@ ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
# for old BR:
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
+ifneq ($(strip $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE)),)
+define UBOOT_COPY_CONFIG_HEADER_FILE
+ cp -pf $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE) $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+endef
+UBOOT_POST_PATCH_HOOKS += UBOOT_COPY_CONFIG_HEADER_FILE
+endif
+
+define UBOOT_UPDATE_CONFIG_HEADER
+ $(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),))
+ $(SED) "s,^#define CONFIG_SYS_SDRAM_MBYTE_SYZE.*,#define CONFIG_SYS_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(endif)
+$(ifneq ($(strip $(BR2_TARGET_ARMADEUS_NR_SDRAM)),))
+ $(SED) "s,^#define CONFIG_NR_DRAM_POPULATED.*,#define CONFIG_NR_DRAM_POPULATED $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(endif)
+endef
+UBOOT_POST_CONFIGURE_HOOKS += UBOOT_UPDATE_CONFIG_HEADER
+
define UBOOT_POST_INSTALL_IMAGES_ACTION
@if [ -e "$(BINARIES_DIR)/$(UBOOT_BIN)" ]; then \
rm -f $(BINARIES_DIR)/$(BOARD_NAME)-$(UBOOT_BIN) ;\
diff --git a/patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
index c81dd7b..cd8a50e 100644
--- a/patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
+++ b/patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
@@ -24,28 +24,3 @@ Index: buildroot/boot/uboot/Config.in
choice
prompt "U-Boot Version"
default BR2_TARGET_UBOOT_2011_12
-Index: buildroot/boot/uboot/uboot.mk
-===================================================================
---- buildroot.orig/boot/uboot/uboot.mk 2012-02-21 16:43:28.000000000 +0100
-+++ buildroot/boot/uboot/uboot.mk 2012-02-21 16:44:26.000000000 +0100
-@@ -35,6 +35,12 @@
-
- UBOOT_ARCH=$(KERNEL_ARCH)
-
-+ifneq ($(strip $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE)),)
-+define UBOOT_COPY_HEADER_FILE
-+ cp -pf $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE) $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
-+endef
-+endif
-+
- UBOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
- UBOOT_MAKE_OPTS += \
- CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
-@@ -62,6 +68,7 @@
- endif
-
- define UBOOT_CONFIGURE_CMDS
-+ $(UBOOT_COPY_HEADER_FILE)
- $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
- $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
- $(UBOOT_BOARD_NAME)_config
diff --git a/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch b/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
deleted file mode 100644
index 40d5c27..0000000
--- a/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Armadeus APF modules require some special U-Boot config variables to be set.
-
-Index: buildroot/boot/uboot/uboot.mk
-===================================================================
---- buildroot/boot/uboot/uboot.mk 2012-03-02 17:43:02.634245000 +0100
-+++ buildroot/boot/uboot/uboot.mk 2012-03-08 17:13:34.000000000 +0100
-@@ -90,6 +90,17 @@ define UBOOT_CONFIGURE_CMDS
- $(call insert_define,CONFIG_ETHADDR,$(BR2_TARGET_UBOOT_ETHADDR))
- $(call insert_define,CONFIG_ETH1ADDR,$(BR2_TARGET_UBOOT_ETH1ADDR))
- @echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/config.h
-+
-+ $(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
-+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
-+$(ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),))
-+ $(SED) "s,^#define CONFIG_SYS_SDRAM_MBYTE_SYZE.*,#define CONFIG_SYS_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
-+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
-+$(endif)
-+$(ifneq ($(strip $(BR2_TARGET_ARMADEUS_NR_SDRAM)),))
-+ $(SED) "s,^#define CONFIG_NR_DRAM_POPULATED.*,#define CONFIG_NR_DRAM_POPULATED $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
-+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
-+$(endif)
- endef
-
- define UBOOT_BUILD_CMDS
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-04-03 16:12:38
|
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 7f8705fc422e80887e229bc05c3f800d8658e2e4 (commit)
via 5b72626c25951e1b3bdb36ef40bdf5f274944db6 (commit)
via 95ce6ad213c4d10e42a78825b75d064a61e5e7f1 (commit)
from a78dfc0f15e3d66e47443e9b2e54d412e0c92e11 (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 7f8705fc422e80887e229bc05c3f800d8658e2e4
Merge: 5b72626 a78dfc0
Author: Julien Boibessot <jul...@ar...>
Date: Tue Apr 3 18:12:08 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 5b72626c25951e1b3bdb36ef40bdf5f274944db6
Author: Julien Boibessot <jul...@ar...>
Date: Tue Apr 3 18:11:27 2012 +0200
[BUILDROOT] Add gst-fsl-plugin and fsl-mm-codeclib packages
commit 95ce6ad213c4d10e42a78825b75d064a61e5e7f1
Author: Julien Boibessot <jul...@ar...>
Date: Tue Apr 3 18:03:07 2012 +0200
[LINUX] APF51: add Freescale's IPU framebuffer driver (preliminary)
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/174-imx-lib-add_package.patch | 11 +-
.../2012.02/184-fsl-mm-codeclib-add_package.patch | 30 +
.../2012.02/185-gst-fsl-plugin-add_package.patch | 97 +
patches/buildroot/2012.02/cleanup_buildroot.sh | 2 +
...dd_freescale_ipu_based_framebuffer_driver.patch | 3362 ++++++++++++++++++++
5 files changed, 3497 insertions(+), 5 deletions(-)
create mode 100644 patches/buildroot/2012.02/184-fsl-mm-codeclib-add_package.patch
create mode 100644 patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch
create mode 100644 patches/linux/2.6.38/447-armadeus-add_freescale_ipu_based_framebuffer_driver.patch
diff --git a/patches/buildroot/2012.02/174-imx-lib-add_package.patch b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
index a590c30..802396a 100644
--- a/patches/buildroot/2012.02/174-imx-lib-add_package.patch
+++ b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
@@ -3,7 +3,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/imx-lib/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/Config.in 2012-03-02 12:03:12.000000000 +0100
++++ buildroot/package/imx-lib/Config.in 2012-04-03 10:31:23.000000000 +0200
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_IMX_LIB
+ bool "imx-lib"
@@ -12,8 +12,8 @@ Index: buildroot/package/imx-lib/Config.in
Index: buildroot/package/imx-lib/imx-lib.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib.mk 2012-03-02 12:13:24.000000000 +0100
-@@ -0,0 +1,45 @@
++++ buildroot/package/imx-lib/imx-lib.mk 2012-04-03 12:24:19.000000000 +0200
+@@ -0,0 +1,46 @@
+#############################################################
+#
+# imx-lib (helpers librairies from Freescale BSP)
@@ -43,6 +43,7 @@ Index: buildroot/package/imx-lib/imx-lib.mk
+ install -D -m 755 $(@D)/vpu/vpu_io.h $(STAGING_DIR)/usr/include
+ install -D -m 755 $(@D)/vpu/vpu_lib.h $(STAGING_DIR)/usr/include
+ install -D -m 755 $(@D)/sahara2/libsahara.so $(STAGING_DIR)/usr/lib
++ install -D -m 755 $(@D)/ipu/mxc_ipu_hl_lib.h $(STAGING_DIR)/usr/include
+endef
+
+define IMX_LIB_INSTALL_TARGET_CMDS
@@ -61,8 +62,8 @@ Index: buildroot/package/imx-lib/imx-lib.mk
+$(eval $(call GENTARGETS))
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-03-02 12:06:29.000000000 +0100
-+++ buildroot/package/Config.in 2012-03-02 12:07:27.000000000 +0100
+--- buildroot.orig/package/Config.in 2012-04-03 10:31:23.000000000 +0200
++++ buildroot/package/Config.in 2012-04-03 18:01:02.000000000 +0200
@@ -349,6 +349,7 @@
endmenu
diff --git a/patches/buildroot/2012.02/184-fsl-mm-codeclib-add_package.patch b/patches/buildroot/2012.02/184-fsl-mm-codeclib-add_package.patch
new file mode 100644
index 0000000..7de6054
--- /dev/null
+++ b/patches/buildroot/2012.02/184-fsl-mm-codeclib-add_package.patch
@@ -0,0 +1,30 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/multimedia/fsl-mm-codeclib/fsl-mm-codeclib.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/multimedia/fsl-mm-codeclib/fsl-mm-codeclib.mk 2012-04-03 17:41:31.000000000 +0200
+@@ -0,0 +1,23 @@
++#############################################################
++#
++# fsl-mm-codeclib (Freescale's multimedia binary (glibc based) codecs)
++# currently some are needed to build gst-fsl-plugins
++#
++#############################################################
++FSL_MM_CODECLIB_VERSION = 2.0.3
++FSL_MM_CODECLIB_SITE = ftp://ftp2.armadeus.com/_downloads
++FSL_MM_CODECLIB_INSTALL_STAGING = YES
++
++define FSL_MM_CODECLIB_INSTALL_STAGING_CMDS
++ cp $(@D)/pkgconfig/*.pc $(STAGING_DIR)/usr/lib/pkgconfig/
++ cp -rf $(@D)/ghdr $(STAGING_DIR)/usr/include/mm_ghdr
++
++ # Needed by software audio PP gstreamer plugin
++ cp $(@D)/release/lib/lib_peq_arm11_elinux.so $(STAGING_DIR)/usr/lib/
++ cd $(STAGING_DIR)/usr/lib/; ln -sf lib_peq_arm11_elinux.so lib_peq_arm11_elinux.so.1.8.0
++
++ # Needed by software deinterlace gstreamer plugin
++ cp $(@D)/release/lib/lib_deinterlace_arm11_elinux.so $(STAGING_DIR)/usr/lib/
++endef
++
++$(eval $(call GENTARGETS))
diff --git a/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch b/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch
new file mode 100644
index 0000000..6d13023
--- /dev/null
+++ b/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch
@@ -0,0 +1,97 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin.mk 2012-04-03 17:42:39.000000000 +0200
+@@ -0,0 +1,41 @@
++#############################################################
++#
++# gst-fsl-plugin (Freescale's gstreamer custom plugins)
++#
++#############################################################
++GST_FSL_PLUGIN_VERSION = 2.0.3
++GST_FSL_PLUGIN_SITE = ftp://ftp2.armadeus.com/_downloads
++GST_FSL_PLUGIN_INSTALL_STAGING = YES
++
++# if gst-fsl-plugin was better configurable, fsl-mm-codeclib dep could be wiped out
++GST_FSL_PLUGIN_DEPENDENCIES = linux gst-plugins-base imx-lib fsl-mm-codeclib
++
++GST_FSL_PLUGIN_CONF_ENV = CPPFLAGS=-I$(LINUX_DIR)/include
++
++ifeq ($(BR2_CPU_NAME),"imx27")
++GST_FSL_PLUGIN_CONF_OPT = PLATFORM=MX27
++else
++GST_FSL_PLUGIN_CONF_OPT = PLATFORM=MX51
++endif
++GST_FSL_PLUGIN_CONF_OPT += --disable-aac_dec \
++ --disable-aacp_dec \
++ --disable-bsac_dec \
++ --disable-mp3_dec \
++ --disable-mp3_enc \
++ --disable-vorbis_dec \
++ --disable-wma10_dec \
++ --disable-downmix \
++ --disable-wma8_enc \
++ --disable-ac3_dec \
++ --disable-h264_dec \
++ --disable-mpeg4_dec \
++ --disable-mpeg2_dec \
++ --disable-wmv9mp_dec \
++ --disable-wmv78_dec \
++
++define GST_FSL_PLUGIN_NO_IPU_HOOK
++ $(SED) 's/$$(IPUDIRS)//' $(@D)/Makefile
++endef
++GST_FSL_PLUGIN_POST_CONFIGURE_HOOKS += GST_FSL_PLUGIN_NO_IPU_HOOK
++
++$(eval $(call AUTOTARGETS))
+Index: buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin-gst_snapshot_stdio.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin-gst_snapshot_stdio.patch 2012-04-03 17:34:37.000000000 +0200
+@@ -0,0 +1,19 @@
++Otherwise build fails with:
++
++gst_snapshot.c: In function 'gst_save_bmp':
++gst_snapshot.c:241:2: error: 'FILE' undeclared (first use in this function)
++gst_snapshot.c:241:2: note: each undeclared identifier is reported only once for each function it appears in
++gst_snapshot.c:241:9: error: 'fp' undeclared (first use in this function)
++gst_snapshot.c:269:2: warning: incompatible implicit declaration of built-in function 'fwrite'
++
++diff -urN -X linux-2.6.38.8/Documentation/dontdiff gst-fsl-plugin-2.0.3/tools/gplay/gst_snapshot.c gst-fsl-plugin-2.0.3.mod/tools/gplay/gst_snapshot.c
++--- gst-fsl-plugin-2.0.3/tools/gplay/gst_snapshot.c 2011-12-02 07:31:40.000000000 +0100
+++++ gst-fsl-plugin-2.0.3.mod/tools/gplay/gst_snapshot.c 2012-04-03 17:29:35.000000000 +0200
++@@ -21,6 +21,7 @@
++ */
++
++ #include <gst/gst.h>
+++#include <stdio.h>
++ #include <string.h>
++ #include "gst_snapshot.h"
++
+Index: buildroot/package/multimedia/gst-fsl-plugin/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/multimedia/gst-fsl-plugin/Config.in 2012-04-03 17:58:51.000000000 +0200
+@@ -0,0 +1,8 @@
++config BR2_PACKAGE_GST_FSL_PLUGIN
++ bool "gst-fsl-plugin"
++ depends on BR2_PACKAGE_GSTREAMER
++ select BR2_PACKAGE_FSL_MM_CODECLIB
++ select BR2_PACKAGE_GST_PLUGINS_BASE
++ select BR2_PACKAGE_IMX_LIB
++ help
++ Freescale's i.MX specific gstreamer plugins.
+Index: buildroot/package/multimedia/Config.in
+===================================================================
+--- buildroot.orig/package/multimedia/Config.in 2012-04-03 17:54:48.000000000 +0200
++++ buildroot/package/multimedia/Config.in 2012-04-03 17:55:22.000000000 +0200
+@@ -8,6 +8,7 @@
+ source "package/multimedia/ffmpeg/Config.in"
+ source "package/multimedia/gstreamer/Config.in"
+ source "package/multimedia/gst-ffmpeg/Config.in"
++source "package/multimedia/gst-fsl-plugin/Config.in"
+ source "package/multimedia/gst-dsp/Config.in"
+ source "package/multimedia/gst-omapfb/Config.in"
+ source "package/multimedia/gst-plugins-base/Config.in"
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 0fcb2c9..a0bcc16 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -68,3 +68,5 @@ rm -rf buildroot/package/imx-lib/
rm -rf buildroot/package/imx-test/
rm -rf buildroot/package/e2fsprogs/
rm -rf buildroot/package/firmware-imx/
+rm -rf buildroot/package/multimedia/gst-fsl-plugin/
+rm -rf buildroot/package/multimedia/fsl-mm-codeclib/
diff --git a/patches/linux/2.6.38/447-armadeus-add_freescale_ipu_based_framebuffer_driver.patch b/patches/linux/2.6.38/447-armadeus-add_freescale_ipu_based_framebuffer_driver.patch
new file mode 100644
index 0000000..2d7ee24
--- /dev/null
+++ b/patches/linux/2.6.38/447-armadeus-add_freescale_ipu_based_framebuffer_driver.patch
@@ -0,0 +1,3362 @@
+As obtained from Freescale's MX53 BSP L2.6.35_11.09.01 + 11.09.01_201112 patches.
+(+ some minor modifications to let them compile on 2.6.38)
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.38.8/drivers/video/mxc/Kconfig
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/video/mxc/Kconfig 2012-04-03 15:27:44.000000000 +0200
+@@ -0,0 +1,115 @@
++menu "Freescale specific framebuffers"
++
++config FB_MXC
++ tristate "MXC Framebuffer support"
++ depends on FB && (MXC_IPU || ARCH_MX21 || ARCH_MX27 || ARCH_MX25)
++ select FB_CFB_FILLRECT
++ select FB_CFB_COPYAREA
++ select FB_CFB_IMAGEBLIT
++ select FB_MODE_HELPERS
++ default y
++ help
++ This is a framebuffer device for the MXC LCD Controller.
++ See <http://www.linux-fbdev.org/> for information on framebuffer
++ devices.
++
++ If you plan to use the LCD display with your MXC system, say
++ Y here.
++
++config FB_MXC_SYNC_PANEL
++ depends on FB_MXC
++ tristate "Synchronous Panel Framebuffer"
++ default y
++
++config FB_MXC_EPSON_VGA_SYNC_PANEL
++ depends on FB_MXC_SYNC_PANEL
++ tristate "Epson VGA Panel"
++ default n
++
++config FB_MXC_TVOUT_TVE
++ tristate "MXC TVE TV Out Encoder"
++ depends on FB_MXC_SYNC_PANEL
++ depends on MXC_IPU_V3
++
++config FB_MXC_LDB
++ tristate "MXC LDB"
++ depends on FB_MXC_SYNC_PANEL
++ depends on MXC_IPU_V3
++
++config FB_MXC_CLAA_WVGA_SYNC_PANEL
++ depends on FB_MXC_SYNC_PANEL
++ tristate "CLAA WVGA Panel"
++
++config FB_MXC_SEIKO_WVGA_SYNC_PANEL
++ depends on FB_MXC_SYNC_PANEL
++ tristate "SEIKO WVGA Panel"
++
++config FB_MXC_SII902X
++ depends on FB_MXC_SYNC_PANEL
++ tristate "Si Image SII9022 DVI/HDMI Interface Chip"
++
++config FB_MXC_CH7026
++ depends on FB_MXC_SYNC_PANEL
++ tristate "Chrontel CH7026 VGA Interface Chip"
++
++config FB_MXC_TVOUT_CH7024
++ tristate "CH7024 TV Out Encoder"
++ depends on FB_MXC_SYNC_PANEL
++
++config FB_MXC_LOW_PWR_DISPLAY
++ bool "Low Power Display Refresh Mode"
++ depends on FB_MXC_SYNC_PANEL && MXC_FB_IRAM
++ default y
++
++config FB_MXC_INTERNAL_MEM
++ bool "Framebuffer in Internal RAM"
++ depends on FB_MXC_SYNC_PANEL && MXC_FB_IRAM
++ default y
++
++config FB_MXC_ASYNC_PANEL
++ depends on FB_MXC
++ bool "Asynchronous Panels"
++ default n
++
++menu "Asynchronous Panel Type"
++ depends on FB_MXC_ASYNC_PANEL && FB_MXC
++
++config FB_MXC_EPSON_PANEL
++ depends on FB_MXC_ASYNC_PANEL
++ default n
++ bool "Epson 176x220 Panel"
++
++endmenu
++
++config FB_MXC_EINK_PANEL
++ depends on FB_MXC
++ depends on DMA_ENGINE
++ select FB_DEFERRED_IO
++ tristate "E-Ink Panel Framebuffer"
++
++config FB_MXC_EINK_AUTO_UPDATE_MODE
++ bool "E-Ink Auto-update Mode Support"
++ default n
++ depends on FB_MXC_EINK_PANEL
++
++config FB_MXC_ELCDIF_FB
++ depends on FB && ARCH_MXC
++ tristate "Support MXC ELCDIF framebuffer"
++
++choice
++ prompt "Async Panel Interface Type"
++ depends on FB_MXC_ASYNC_PANEL && FB_MXC
++ default FB_MXC_ASYNC_PANEL_IFC_16_BIT
++
++config FB_MXC_ASYNC_PANEL_IFC_8_BIT
++ bool "8-bit Parallel Bus Interface"
++
++config FB_MXC_ASYNC_PANEL_IFC_16_BIT
++ bool "16-bit Parallel Bus Interface"
++
++config FB_MXC_ASYNC_PANEL_IFC_SERIAL
++ bool "Serial Bus Interface"
++
++endchoice
++
++endmenu
+Index: linux-2.6.38.8/drivers/video/mxc/Makefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/video/mxc/Makefile 2012-04-03 14:35:09.000000000 +0200
+@@ -0,0 +1,26 @@
++obj-$(CONFIG_FB_MXC_TVOUT_TVE) += tve.o
++obj-$(CONFIG_FB_MXC_SII902X) += mxcfb_sii902x.o
++obj-$(CONFIG_FB_MXC_LDB) += ldb.o
++obj-$(CONFIG_FB_MODE_HELPERS) += mxc_edid.o mxc_ddc.o
++ifeq ($(CONFIG_ARCH_MX21)$(CONFIG_ARCH_MX27)$(CONFIG_ARCH_MX25),y)
++ obj-$(CONFIG_FB_MXC_TVOUT) += fs453.o
++ obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mx2fb.o mxcfb_modedb.o
++ obj-$(CONFIG_FB_MXC_EPSON_PANEL) += mx2fb_epson.o
++else
++ifeq ($(CONFIG_MXC_IPU_V1),y)
++ obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxcfb.o mxcfb_modedb.o
++else
++ obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxc_ipuv3_fb.o
++endif
++ obj-$(CONFIG_FB_MXC_EPSON_PANEL) += mxcfb_epson.o
++ obj-$(CONFIG_FB_MXC_EPSON_QVGA_PANEL) += mxcfb_epson_qvga.o
++ obj-$(CONFIG_FB_MXC_TOSHIBA_QVGA_PANEL) += mxcfb_toshiba_qvga.o
++ obj-$(CONFIG_FB_MXC_SHARP_128_PANEL) += mxcfb_sharp_128x128.o
++endif
++obj-$(CONFIG_FB_MXC_EPSON_VGA_SYNC_PANEL) += mxcfb_epson_vga.o
++obj-$(CONFIG_FB_MXC_CLAA_WVGA_SYNC_PANEL) += mxcfb_claa_wvga.o
++obj-$(CONFIG_FB_MXC_SEIKO_WVGA_SYNC_PANEL) += mxcfb_seiko_wvga.o
++obj-$(CONFIG_FB_MXC_TVOUT_CH7024) += ch7024.o
++obj-$(CONFIG_FB_MXC_CH7026) += mxcfb_ch7026.o
++obj-$(CONFIG_FB_MXC_EINK_PANEL) += mxc_epdc_fb.o
++obj-$(CONFIG_FB_MXC_ELCDIF_FB) += mxc_elcdif_fb.o
+Index: linux-2.6.38.8/drivers/video/mxc/mxc_ipuv3_fb.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/video/mxc/mxc_ipuv3_fb.c 2012-04-03 16:25:43.000000000 +0200
+@@ -0,0 +1,2091 @@
++/*
++ * Copyright 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
++ */
++
++/*
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/*!
++ * @defgroup Framebuffer Framebuffer Driver for SDC and ADC.
++ */
++
++/*!
++ * @file mxcfb.c
++ *
++ * @brief MXC Frame buffer driver for SDC
++ *
++ * @ingroup Framebuffer
++ */
++
++/*!
++ * Include files
++ */
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/platform_device.h>
++#include <linux/sched.h>
++#include <linux/errno.h>
++#include <linux/string.h>
++#include <linux/interrupt.h>
++#include <linux/slab.h>
++#include <linux/fb.h>
++#include <linux/delay.h>
++#include <linux/init.h>
++#include <linux/ioport.h>
++#include <linux/dma-mapping.h>
++#include <linux/clk.h>
++#include <linux/console.h>
++#include <linux/io.h>
++#include <linux/ipu.h>
++#include <linux/mxcfb.h>
++#include <linux/uaccess.h>
++#include <linux/fsl_devices.h>
++#include <asm/mach-types.h>
++
++/*
++ * Driver name
++ */
++#define MXCFB_NAME "mxc_sdc_fb"
++
++/* Display port number */
++#define MXCFB_PORT_NUM 2
++/*!
++ * Structure containing the MXC specific framebuffer information.
++ */
++struct mxcfb_info {
++ char *fb_mode_str;
++ int default_bpp;
++ int cur_blank;
++ int next_blank;
++ ipu_channel_t ipu_ch;
++ int ipu_di;
++ u32 ipu_di_pix_fmt;
++ bool ipu_int_clk;
++ bool overlay;
++ bool alpha_chan_en;
++ dma_addr_t alpha_phy_addr0;
++ dma_addr_t alpha_phy_addr1;
++ void *alpha_virt_addr0;
++ void *alpha_virt_addr1;
++ uint32_t alpha_mem_len;
++ uint32_t ipu_ch_irq;
++ uint32_t ipu_alp_ch_irq;
++ uint32_t cur_ipu_buf;
++ uint32_t cur_ipu_alpha_buf;
++
++ u32 pseudo_palette[16];
++
++ bool wait4vsync;
++ struct semaphore flip_sem;
++ struct semaphore alpha_flip_sem;
++ struct completion vsync_complete;
++
++ bool fb_suspended;
++};
++
++struct mxcfb_mode {
++ int dev_mode;
++ int num_modes;
++ struct fb_videomode *mode;
++};
++
++struct mxcfb_alloc_list {
++ struct list_head list;
++ dma_addr_t phy_addr;
++ void *cpu_addr;
++ u32 size;
++};
++
++enum {
++ BOTH_ON,
++ SRC_ON,
++ TGT_ON,
++ BOTH_OFF
++};
++
++static bool g_dp_in_use;
++LIST_HEAD(fb_alloc_list);
++static struct fb_info *mxcfb_info[3];
++static struct mxcfb_mode mxc_disp_mode[MXCFB_PORT_NUM];
++static int (*mxcfb_pre_setup[MXCFB_PORT_NUM])(struct fb_info *info);
++
++/*
++ * register pre-setup callback for some display
++ * driver which need prepare clk etc.
++ */
++void mxcfb_register_presetup(int disp_port,
++ int (*pre_setup)(struct fb_info *info))
++{
++ if (pre_setup)
++ mxcfb_pre_setup[disp_port] = pre_setup;
++}
++EXPORT_SYMBOL(mxcfb_register_presetup);
++
++/*
++ * mode register from each display driver before
++ * primary fb setting.
++ */
++void mxcfb_register_mode(int disp_port,
++ const struct fb_videomode *modedb,
++ int num_modes, int dev_mode)
++{
++ struct fb_videomode *mode;
++ int mode_sum;
++
++ if (disp_port > MXCFB_PORT_NUM)
++ return;
++
++ /*
++ * if there is new DDC device, overwrite old modes.
++ * if there is old DDC device while new device is not DDC,
++ * just keep old DDC modes.
++ */
++ if (dev_mode & MXC_DISP_DDC_DEV) {
++ if (mxc_disp_mode[disp_port].num_modes) {
++ kfree(mxc_disp_mode[disp_port].mode);
++ mxc_disp_mode[disp_port].num_modes = 0;
++ }
++ } else if (mxc_disp_mode[disp_port].dev_mode & MXC_DISP_DDC_DEV)
++ return;
++
++ mode_sum = mxc_disp_mode[disp_port].num_modes + num_modes;
++ mode = kzalloc(mode_sum * sizeof(struct fb_videomode), GFP_KERNEL);
++
++ if (mxc_disp_mode[disp_port].num_modes)
++ memcpy(mode, mxc_disp_mode[disp_port].mode,
++ mxc_disp_mode[disp_port].num_modes
++ * sizeof(struct fb_videomode));
++ if (modedb)
++ memcpy(mode + mxc_disp_mode[disp_port].num_modes,
++ modedb, num_modes * sizeof(struct fb_videomode));
++
++ if (mxc_disp_mode[disp_port].num_modes)
++ kfree(mxc_disp_mode[disp_port].mode);
++
++ mxc_disp_mode[disp_port].mode = mode;
++ mxc_disp_mode[disp_port].num_modes += num_modes;
++ mxc_disp_mode[disp_port].dev_mode = dev_mode;
++
++ return;
++}
++EXPORT_SYMBOL(mxcfb_register_mode);
++
++static uint32_t bpp_to_pixfmt(struct fb_info *fbi)
++{
++ uint32_t pixfmt = 0;
++
++ if (fbi->var.nonstd)
++ return fbi->var.nonstd;
++
++ switch (fbi->var.bits_per_pixel) {
++ case 24:
++ pixfmt = IPU_PIX_FMT_BGR24;
++ break;
++ case 32:
++ pixfmt = IPU_PIX_FMT_BGR32;
++ break;
++ case 16:
++ pixfmt = IPU_PIX_FMT_RGB565;
++ break;
++ }
++ return pixfmt;
++}
++
++static irqreturn_t mxcfb_irq_handler(int irq, void *dev_id);
++static int mxcfb_blank(int blank, struct fb_info *info);
++static int mxcfb_map_video_memory(struct fb_info *fbi);
++static int mxcfb_unmap_video_memory(struct fb_info *fbi);
++static int mxcfb_option_setup(struct fb_info *info, char *options);
++
++/*
++ * Set fixed framebuffer parameters based on variable settings.
++ *
++ * @param info framebuffer information pointer
++ */
++static int mxcfb_set_fix(struct fb_info *info)
++{
++ struct fb_fix_screeninfo *fix = &info->fix;
++ struct fb_var_screeninfo *var = &info->var;
++
++ fix->line_length = var->xres_virtual * var->bits_per_pixel / 8;
++
++ fix->type = FB_TYPE_PACKED_PIXELS;
++ fix->accel = FB_ACCEL_NONE;
++ fix->visual = FB_VISUAL_TRUECOLOR;
++ fix->xpanstep = 0;
++ fix->ywrapstep = 1;
++ fix->ypanstep = 1;
++
++ return 0;
++}
++
++static int _setup_disp_channel1(struct fb_info *fbi)
++{
++ ipu_channel_params_t params;
++ struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par;
++
++ memset(¶ms, 0, sizeof(params));
++ params.mem_dp_bg_sync.di = mxc_fbi->ipu_di;
++
++ /*
++ * Assuming interlaced means yuv output, below setting also
++ * valid for mem_dc_sync. FG should have the same vmode as BG.
++ */
++ if (mxc_fbi->ipu_ch == MEM_FG_SYNC) {
++ struct mxcfb_info *mxc_fbi_tmp;
++ int i;
++
++ for (i = 0; i < num_registered_fb; i++) {
++ mxc_fbi_tmp = (struct mxcfb_info *)
++ (registered_fb[i]->par);
++ if (mxc_fbi_tmp->ipu_ch == MEM_BG_SYNC) {
++ fbi->var.vmode =
++ registered_fb[i]->var.vmode;
++ mxc_fbi->ipu_di_pix_fmt =
++ mxc_fbi_tmp->ipu_di_pix_fmt;
++ break;
++ }
++ }
++ }
++ if (mxc_fbi->ipu_ch == MEM_DC_SYNC) {
++ if (fbi->var.vmode & FB_VMODE_INTERLACED) {
++ params.mem_dc_sync.interlaced = true;
++ params.mem_dc_sync.out_pixel_fmt =
++ IPU_PIX_FMT_YUV444;
++ } else {
++ if (mxc_fbi->ipu_di_pix_fmt)
++ params.mem_dc_sync.out_pixel_fmt = mxc_fbi->ipu_di_pix_fmt;
++ else
++ params.mem_dc_sync.out_pixel_fmt = IPU_PIX_FMT_RGB666;
++ }
++ params.mem_dc_sync.in_pixel_fmt = bpp_to_pixfmt(fbi);
++ } else {
++ if (fbi->var.vmode & FB_VMODE_INTERLACED) {
++ params.mem_dp_bg_sync.interlaced = true;
++ params.mem_dp_bg_sync.out_pixel_fmt =
++ IPU_PIX_FMT_YUV444;
++ } else {
++ if (mxc_fbi->ipu_di_pix_fmt)
++ params.mem_dp_bg_sync.out_pixel_fmt = mxc_fbi->ipu_di_pix_fmt;
++ else
++ params.mem_dp_bg_sync.out_pixel_fmt = IPU_PIX_FMT_RGB666;
++ }
++ params.mem_dp_bg_sync.in_pixel_fmt = bpp_to_pixfmt(fbi);
++ if (mxc_fbi->alpha_chan_en)
++ params.mem_dp_bg_sync.alpha_chan_en = true;
++ }
++ ipu_init_channel(mxc_fbi->ipu_ch, ¶ms);
++
++ return 0;
++}
++
++static int _setup_disp_channel2(struct fb_info *fbi)
++{
++ int retval = 0;
++ struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par;
++ int fb_stride;
++ unsigned long base;
++
++ switch (bpp_to_pixfmt(fbi)) {
++ case IPU_PIX_FMT_YUV420P2:
++ case IPU_PIX_FMT_YVU420P:
++ case IPU_PIX_FMT_NV12:
++ case IPU_PIX_FMT_YUV422P:
++ case IPU_PIX_FMT_YVU422P:
++ case IPU_PIX_FMT_YUV420P:
++ fb_stride = fbi->var.xres_virtual;
++ break;
++ default:
++ fb_stride = fbi->fix.line_length;
++ }
++
++ mxc_fbi->cur_ipu_buf = 2;
++ sema_init(&mxc_fbi->flip_sem, 1);
++ if (mxc_fbi->alpha_chan_en) {
++ mxc_fbi->cur_ipu_alpha_buf = 1;
++ sema_init(&mxc_fbi->alpha_flip_sem, 1);
++ }
++ fbi->var.xoffset = 0;
++
++ base = (fbi->var.yoffset * fbi->var.xres_virtual + fbi->var.xoffset);
++ base = (fbi->var.bits_per_pixel) * base / 8;
++ base += fbi->fix.smem_start;
++
++ retval = ipu_init_channel_buffer(mxc_fbi->ipu_ch, IPU_INPUT_BUFFER,
++ bpp_to_pixfmt(fbi),
++ fbi->var.xres, fbi->var.yres,
++ fb_stride,
++ IPU_ROTATE_NONE,
++ base,
++ base,
++ (fbi->var.accel_flags ==
++ FB_ACCEL_TRIPLE_FLAG) ? base : 0,
++ 0, 0);
++ if (retval) {
++ dev_err(fbi->device,
++ "ipu_init_channel_buffer error %d\n", retval);
++ }
++
++ if (mxc_fbi->alpha_chan_en) {
++ retval = ipu_init_channel_buffer(mxc_fbi->ipu_ch,
++ IPU_ALPHA_IN_BUFFER,
++ IPU_PIX_FMT_GENERIC,
++ fbi->var.xres, fbi->var.yres,
++ fbi->var.xres,
++ IPU_ROTATE_NONE,
++ mxc_fbi->alpha_phy_addr1,
++ mxc_fbi->alpha_phy_addr0,
++ 0,
++ 0, 0);
++ if (retval) {
++ dev_err(fbi->device,
++ "ipu_init_channel_buffer error %d\n", retval);
++ return retval;
++ }
++ }
++
++ return retval;
++}
++
++/*
++ * Set framebuffer parameters and change the operating mode.
++ *
++ * @param info framebuffer information pointer
++ */
++static int mxcfb_set_par(struct fb_info *fbi)
++{
++ int retval = 0;
++ u32 mem_len, alpha_mem_len;
++ ipu_di_signal_cfg_t sig_cfg;
++ struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par;
++
++ dev_dbg(fbi->device, "Reconfiguring framebuffer\n");
++
++ ipu_disable_irq(mxc_fbi->ipu_ch_irq);
++ ipu_disable_channel(mxc_fbi->ipu_ch, true);
++ ipu_uninit_channel(mxc_fbi->ipu_ch);
++ ipu_clear_irq(mxc_fbi->ipu_ch_irq);
++ mxcfb_set_fix(fbi);
++
++ mem_len = fbi->var.yres_virtual * fbi->fix.line_length;
++ if (!fbi->fix.smem_start || (mem_len > fbi->fix.smem_len)) {
++ if (fbi->fix.smem_start)
++ mxcfb_unmap_video_memory(fbi);
++
++ if (mxcfb_map_video_memory(fbi) < 0)
++ return -ENOMEM;
++ }
++ if (mxc_fbi->alpha_chan_en) {
++ alpha_mem_len = fbi->var.xres * fbi->var.yres;
++ if ((!mxc_fbi->alpha_phy_addr0 && !mxc_fbi->alpha_phy_addr1) ||
++ (alpha_mem_len > mxc_fbi->alpha_mem_len)) {
++ if (mxc_fbi->alpha_phy_addr0)
++ dma_free_coherent(fbi->device,
++ mxc_fbi->alpha_mem_len,
++ mxc_fbi->alpha_virt_addr0,
++ mxc_fbi->alpha_phy_addr0);
++ if (mxc_fbi->alpha_phy_addr1)
++ dma_free_coherent(fbi->device,
++ mxc_fbi->alpha_mem_len,
++ mxc_fbi->alpha_virt_addr1,
++ mxc_fbi->alpha_phy_addr1);
++
++ mxc_fbi->alpha_virt_addr0 =
++ dma_alloc_coherent(fbi->device,
++ alpha_mem_len,
++ &mxc_fbi->alpha_phy_addr0,
++ GFP_DMA | GFP_KERNEL);
++
++ mxc_fbi->alpha_virt_addr1 =
++ dma_alloc_coherent(fbi->device,
++ alpha_mem_len,
++ &mxc_fbi->alpha_phy_addr1,
++ GFP_DMA | GFP_KERNEL);
++ if (mxc_fbi->alpha_virt_addr0 == NULL ||
++ mxc_fbi->alpha_virt_addr1 == NULL) {
++ dev_err(fbi->device, "mxcfb: dma alloc for"
++ " alpha buffer failed.\n");
++ if (mxc_fbi->alpha_virt_addr0)
++ dma_free_coherent(fbi->device,
++ mxc_fbi->alpha_mem_len,
++ mxc_fbi->alpha_virt_addr0,
++ mxc_fbi->alpha_phy_addr0);
++ if (mxc_fbi->alpha_virt_addr1)
++ dma_free_coherent(fbi->device,
++ mxc_fbi->alpha_mem_len,
++ mxc_fbi->alpha_virt_addr1,
++ mxc_fbi->alpha_phy_addr1);
++ return -ENOMEM;
++ }
++ mxc_fbi->alpha_mem_len = alpha_mem_len;
++ }
++ }
++
++ if (mxc_fbi->next_blank != FB_BLANK_UNBLANK ||
++ mxc_fbi->fb_suspended)
++ return retval;
++
++ _setup_disp_channel1(fbi);
++
++ if (!mxc_fbi->overlay) {
++ uint32_t out_pixel_fmt;
++
++ memset(&sig_cfg, 0, sizeof(sig_cfg));
++ if (fbi->var.vmode & FB_VMODE_INTERLACED) {
++ sig_cfg.interlaced = true;
++ out_pixel_fmt = IPU_PIX_FMT_YUV444;
++ } else {
++ if (mxc_fbi->ipu_di_pix_fmt)
++ out_pixel_fmt = mxc_fbi->ipu_di_pix_fmt;
++ else
++ out_pixel_fmt = IPU_PIX_FMT_RGB666;
++ }
++ if (fbi->var.vmode & FB_VMODE_ODD_FLD_FIRST) /* PAL */
++ sig_cfg.odd_field_first = true;
++ if (mxc_fbi->ipu_int_clk)
++ sig_cfg.int_clk = true;
++ if (fbi->var.sync & FB_SYNC_HOR_HIGH_ACT)
++ sig_cfg.Hsync_pol = true;
++ if (fbi->var.sync & FB_SYNC_VERT_HIGH_ACT)
++ sig_cfg.Vsync_pol = true;
++ if (!(fbi->var.sync & FB_SYNC_CLK_LAT_FALL))
++ sig_cfg.clk_pol = true;
++ if (fbi->var.sync & FB_SYNC_DATA_INVERT)
++ sig_cfg.data_pol = true;
++ if (!(fbi->var.sync & FB_SYNC_OE_LOW_ACT))
++ sig_cfg.enable_pol = true;
++ if (fbi->var.sync & FB_SYNC_CLK_IDLE_EN)
++ sig_cfg.clkidle_en = true;
++
++ dev_dbg(fbi->device, "pixclock = %ul Hz\n",
++ (u32) (PICOS2KHZ(fbi->var.pixclock) * 1000UL));
++
++ if (ipu_init_sync_panel(mxc_fbi->ipu_di,
++ (PICOS2KHZ(fbi->var.pixclock)) * 1000UL,
++ fbi->var.xres, fbi->var.yres,
++ out_pixel_fmt,
++ fbi->var.left_margin,
++ fbi->var.hsync_len,
++ fbi->var.right_margin,
++ fbi->var.upper_margin,
++ fbi->var.vsync_len,
++ fbi->var.lower_margin,
++ 0, sig_cfg) != 0) {
++ dev_err(fbi->device,
++ "mxcfb: Error initializing panel.\n");
++ return -EINVAL;
++ }
++
++ fbi->mode =
++ (struct fb_videomode *)fb_match_mode(&fbi->var,
++ &fbi->modelist);
++
++ ipu_disp_set_window_pos(mxc_fbi->ipu_ch, 0, 0);
++ }
++
++ retval = _setup_disp_channel2(fbi);
++ if (retval)
++ return retval;
++
++ ipu_enable_channel(mxc_fbi->ipu_ch);
++
++ mxc_fbi->cur_blank = FB_BLANK_UNBLANK;
++
++ return retval;
++}
++
++static int _swap_channels(struct fb_info *fbi,
++ struct fb_info *fbi_to, bool both_on)
++{
++ int retval, tmp;
++ ipu_channel_t old_ch;
++ struct mxcfb_info *mxc_fbi_from = (struct mxcfb_info *)fbi->par;
++ struct mxcfb_info *mxc_fbi_to = (struct mxcfb_info *)fbi_to->par;
++
++ if (both_on) {
++ ipu_disable_channel(mxc_fbi_to->ipu_ch, true);
++ ipu_uninit_channel(mxc_fbi_to->ipu_ch);
++ }
++
++ /* switch the mxc fbi parameters */
++ old_ch = mxc_fbi_from->ipu_ch;
++ mxc_fbi_from->ipu_ch = mxc_fbi_to->ipu_ch;
++ mxc_fbi_to->ipu_ch = old_ch;
++ tmp = mxc_fbi_from->ipu_ch_irq;
++ mxc_fbi_from->ipu_ch_irq = mxc_fbi_to->ipu_ch_irq;
++ mxc_fbi_to->ipu_ch_irq = tmp;
++
++ _setup_disp_channel1(fbi);
++ retval = _setup_disp_channel2(fbi);
++ if (retval)
++ return retval;
++
++ /* switch between dp and dc, disable old idmac, enable new idmac */
++ retval = ipu_swap_channel(old_ch, mxc_fbi_from->ipu_ch);
++ ipu_uninit_channel(old_ch);
++
++ if (both_on) {
++ _setup_disp_channel1(fbi_to);
++ retval = _setup_disp_channel2(fbi_to);
++ if (retval)
++ return retval;
++ ipu_enable_channel(mxc_fbi_to->ipu_ch);
++ }
++
++ return retval;
++}
++
++static int swap_channels(struct fb_info *fbi)
++{
++ int i;
++ int swap_mode;
++ ipu_channel_t ch_to;
++ struct mxcfb_info *mxc_fbi_from = (struct mxcfb_info *)fbi->par;
++ struct fb_info *fbi_to = NULL;
++ struct mxcfb_info *mxc_fbi_to;
++
++ /* what's the target channel? */
++ if (mxc_fbi_from->ipu_ch == MEM_BG_SYNC)
++ ch_to = MEM_DC_SYNC;
++ else
++ ch_to = MEM_BG_SYNC;
++
++ for (i = 0; i < num_registered_fb; i++) {
++ mxc_fbi_to =
++ (struct mxcfb_info *)mxcfb_info[i]->par;
++ if (mxc_fbi_to->ipu_ch == ch_to) {
++ fbi_to = mxcfb_info[i];
++ break;
++ }
++ }
++ if (fbi_to == NULL)
++ return -1;
++
++ ipu_clear_irq(mxc_fbi_from->ipu_ch_irq);
++ ipu_clear_irq(mxc_fbi_to->ipu_ch_irq);
++ ipu_free_irq(mxc_fbi_from->ipu_ch_irq, fbi);
++ ipu_free_irq(mxc_fbi_to->ipu_ch_irq, fbi_to);
++
++ if (mxc_fbi_from->cur_blank == FB_BLANK_UNBLANK) {
++ if (mxc_fbi_to->cur_blank == FB_BLANK_UNBLANK)
++ swap_mode = BOTH_ON;
++ else
++ swap_mode = SRC_ON;
++ } else {
++ if (mxc_fbi_to->cur_blank == FB_BLANK_UNBLANK)
++ swap_mode = TGT_ON;
++ else
++ swap_mode = BOTH_OFF;
++ }
++
++ /* tvout di-1: for DC use UYVY, for DP use RGB */
++ if (mxc_fbi_from->ipu_di == 1 && ch_to == MEM_DC_SYNC) {
++ fbi->var.bits_per_pixel = 16;
++ fbi->var.nonstd = IPU_PIX_FMT_UYVY;
++ } else if (mxc_fbi_from->ipu_di == 1 && ch_to == MEM_BG_SYNC) {
++ fbi->var.nonstd = 0;
++ } else if (mxc_fbi_from->ipu_di == 0 && ch_to == MEM_DC_SYNC) {
++ fbi_to->var.nonstd = 0;
++ } else if (mxc_fbi_from->ipu_di == 0 && ch_to == MEM_BG_SYNC) {
++ fbi->var.bits_per_pixel = 16;
++ fbi->var.nonstd = IPU_PIX_FMT_UYVY;
++ }
++
++ switch (swap_mode) {
++ case BOTH_ON:
++ /* disable target->switch src->enable target */
++ _swap_channels(fbi, fbi_to, true);
++ break;
++ case SRC_ON:
++ /* just switch src */
++ _swap_channels(fbi, fbi_to, false);
++ break;
++ case TGT_ON:
++ /* just switch target */
++ _swap_channels(fbi_to, fbi, false);
++ break;
++ case BOTH_OFF:
++ /* switch directly, no more need to do */
++ mxc_fbi_to->ipu_ch = mxc_fbi_from->ipu_ch;
++ mxc_fbi_from->ipu_ch = ch_to;
++ i = mxc_fbi_from->ipu_ch_irq;
++ mxc_fbi_from->ipu_ch_irq = mxc_fbi_to->ipu_ch_irq;
++ mxc_fbi_to->ipu_ch_irq = i;
++ break;
++ default:
++ break;
++ }
++
++ if (ipu_request_irq(mxc_fbi_from->ipu_ch_irq, mxcfb_irq_handler, 0,
++ MXCFB_NAME, fbi) != 0) {
++ dev_err(fbi->device, "Error registering irq %d\n",
++ mxc_fbi_from->ipu_ch_irq);
++ return -EBUSY;
++ }
++ ipu_disable_irq(mxc_fbi_from->ipu_ch_irq);
++ if (ipu_request_irq(mxc_fbi_to->ipu_ch_irq, mxcfb_irq_handler, 0,
++ MXCFB_NAME, fbi_to) != 0) {
++ dev_err(fbi_to->device, "Error registering irq %d\n",
++ mxc_fbi_to->ipu_ch_irq);
++ return -EBUSY;
++ }
++ ipu_disable_irq(mxc_fbi_to->ipu_ch_irq);
++
++ return 0;
++}
++
++/*
++ * Check framebuffer variable parameters and adjust to valid values.
++ *
++ * @param var framebuffer variable parameters
++ *
++ * @param info framebuffer information pointer
++ */
++static int mxcfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
++{
++ u32 vtotal;
++ u32 htotal;
++ struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)info->par;
++
++ /* fg should not bigger than bg */
++ if (mxc_fbi->ipu_ch == MEM_FG_SYNC) {
++ struct fb_info *fbi_tmp;
++ struct mxcfb_info *mxc_fbi_tmp;
++ int i, bg_xres, bg_yres;
++ int16_t pos_x, pos_y;
++
++ bg_xres = var->xres;
++ bg_yres = var->yres;
++
++ for (i = 0; i < num_registered_fb; i++) {
++ fbi_tmp = registered_fb[i];
++ mxc_fbi_tmp = (struct mxcfb_info *)
++ (fbi_tmp->par);
++ if (mxc_fbi_tmp->ipu_ch == MEM_BG_SYNC) {
++ bg_xres = fbi_tmp->var.xres;
++ bg_yres = fbi_tmp->var.yres;
++ break;
++ }
++ }
++
++ ipu_disp_get_window_pos(mxc_fbi->ipu_ch, &pos_x, &pos_y);
++
++ if ((var->xres + pos_x) > bg_xres)
++ var->xres = bg_xres - pos_x;
++ if ((var->yres + pos_y) > bg_yres)
++ var->yres = bg_yres - pos_y;
++ }
++
++ if (var->xres_virtual < var->xres)
++ var->xres_virtual = var->xres;
++
++ /* Default Y virtual size is 3*yres */
++ if (var->yres_virtual < var->yres * 3)
++ var->yres_virtual = var->yres * 3;
++
++ if ((var->bits_per_pixel != 32) && (var->bits_per_pixel != 24) &&
++ (var->bits_per_pixel != 16) && (var->bits_per_pixel != 12) &&
++ (var->bits_per_pixel != 8))
++ var->bits_per_pixel = 16;
++
++ switch (var->bits_per_pixel) {
++ case 8:
++ var->red.length = 3;
++ var->red.offset = 5;
++ var->red.msb_right = 0;
++
++ var->green.length = 3;
++ var->green.offset = 2;
++ var->green.msb_right = 0;
++
++ var->blue.length = 2;
++ var->blue.offset = 0;
++ var->blue.msb_right = 0;
++
++ var->transp.length = 0;
++ var->transp.offset = 0;
++ var->transp.msb_right = 0;
++ break;
++ case 16:
++ var->red.length = 5;
++ var->red.offset = 11;
++ var->red.msb_right = 0;
++
++ var->green.length = 6;
++ var->green.offset = 5;
++ var->green.msb_right = 0;
++
++ var->blue.length = 5;
++ var->blue.offset = 0;
++ var->blue.msb_right = 0;
++
++ var->transp.length = 0;
++ var->transp.offset = 0;
++ var->transp.msb_right = 0;
++ break;
++ case 24:
++ var->red.length = 8;
++ var->red.offset = 16;
++ var->red.msb_right = 0;
++
++ var->green.length = 8;
++ var->green.offset = 8;
++ var->green.msb_right = 0;
++
++ var->blue.length = 8;
++ var->blue.offset = 0;
++ var->blue.msb_right = 0;
++
++ var->transp.length = 0;
++ var->transp.offset = 0;
++ var->transp.msb_right = 0;
++ break;
++ case 32:
++ var->red.length = 8;
++ var->red.offset = 16;
++ var->red.msb_right = 0;
++
++ var->green.length = 8;
++ var->green.offset = 8;
++ var->green.msb_right = 0;
++
++ var->blue.length = 8;
++ var->blue.offset = 0;
++ var->blue.msb_right = 0;
++
++ var->transp.length = 8;
++ var->transp.offset = 24;
++ var->transp.msb_right = 0;
++ break;
++ }
++
++ if (var->pixclock < 1000) {
++ htotal = var->xres + var->right_margin + var->hsync_len +
++ var->left_margin;
++ vtotal = var->yres + var->lower_margin + var->vsync_len +
++ var->upper_margin;
++ var->pixclock = (vtotal * htotal * 6UL) / 100UL;
++ var->pixclock = KHZ2PICOS(var->pixclock);
++ dev_dbg(info->device,
++ "pixclock set for 60Hz refresh = %u ps\n",
++ var->pixclock);
++ }
++
++ var->height = -1;
++ var->width = -1;
++ var->grayscale = 0;
++
++ return 0;
++}
++
++static inline u_int _chan_to_field(u_int chan, struct fb_bitfield *bf)
++{
++ chan &= 0xffff;
++ chan >>= 16 - bf->length;
++ return chan << bf->offset;
++}
++
++static int mxcfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
++ u_int trans, struct fb_info *fbi)
++{
++ unsigned int val;
++ int ret = 1;
++
++ /*
++ * If greyscale is true, then we convert the RGB value
++ * to greyscale no matter what visual we are using.
++ */
++ if (fbi->var.grayscale)
++ red = green = blue = (19595 * red + 38470 * green +
++ 7471 * blue) >> 16;
++ switch (fbi->fix.visual) {
++ case FB_VISUAL_TRUECOLOR:
++ /*
++ * 16-bit True Colour. We encode the RGB value
++ * according to the RGB bitfield information.
++ */
++ if (regno < 16) {
++ u32 *pal = fbi->pseudo_palette;
++
++ val = _chan_to_field(red, &fbi->var.red);
++ val |= _chan_to_field(green, &fbi->var.green);
++ val |= _chan_to_field(blue, &fbi->var.blue);
++
++ pal[regno] = val;
++ ret = 0;
++ }
++ break;
++
++ case FB_VISUAL_STATIC_PSEUDOCOLOR:
++ case FB_VISUAL_PSEUDOCOLOR:
++ break;
++ }
++
++ return ret;
++}
++
++/*
++ * Function to handle custom ioctls for MXC framebuffer.
++ *
++ * @param inode inode struct
++ *
++ * @param file file struct
++ *
++ * @param cmd Ioctl command to handle
++ *
++ * @param arg User pointer to command arguments
++ *
++ * @param fbi framebuffer information pointer
++ */
++static int mxcfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
++{
++ int retval = 0;
++ int __user *argp = (void __user *)arg;
++ struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par;
++
++ switch (cmd) {
++ case MXCFB_SET_GBL_ALPHA:
++ {
++ struct mxcfb_gbl_alpha ga;
++
++ if (copy_from_user(&ga, (void *)arg, sizeof(ga))) {
++ retval = -EFAULT;
++ break;
++ }
++
++ if (ipu_disp_set_global_alpha(mxc_fbi->ipu_ch,
++ (bool)ga.enable,
++ ga.alpha)) {
++ retval = -EINVAL;
++ break;
++ }
++
++ if (ga.enable)
++ mxc_fbi->alpha_chan_en = false;
++
++ if (ga.enable)
++ dev_dbg(fbi->device,
++ "Set global alpha of %s to %d\n",
++ fbi->fix.id, ga.alpha);
++ break;
++ }
++ case MXCFB_SET_LOC_ALPHA:
++ {
++ struct mxcfb_loc_alpha la;
++ int i;
++ char *video_plane_idstr = "";
++
++ if (copy_from_user(&la, (void *)arg, sizeof(la))) {
++ retval = -EFAULT;
++ break;
++ }
++
++ if (ipu_disp_set_global_alpha(mxc_fbi->ipu_ch,
++ !(bool)la.enable, 0)) {
++ retval = -EINVAL;
++ break;
++ }
++
++ if (la.enable && !la.alpha_in_pixel) {
++ mxc_fbi->alpha_chan_en = true;
++
++ if (mxc_fbi->ipu_ch == MEM_FG_SYNC)
++ video_plane_idstr = "DISP3 BG";
++ else if (mxc_fbi->ipu_ch == MEM_BG_SYNC)
++ video_plane_idstr = "DISP3 FG";
++
++ for (i = 0; i < num_registered_fb; i++) {
++ char *idstr = registered_fb[i]->fix.id;
++ if (strcmp(idstr, video_plane_idstr) == 0) {
++ ((struct mxcfb_info *)(registered_fb[i]->par))->alpha_chan_en = false;
++ break;
++ }
++ }
++ } else
++ mxc_fbi->alpha_chan_en = false;
++
++ console_lock();
++ mxcfb_set_par(fbi);
++ console_unlock();
++
++ la.alpha_phy_addr0 = mxc_fbi->alpha_phy_addr0;
++ la.alpha_phy_addr1 = mxc_fbi->alpha_phy_addr1;
++ if (copy_to_user((void *)arg, &la, sizeof(la))) {
++ retval = -EFAULT;
++ break;
++ }
++
++ if (la.enable)
++ dev_dbg(fbi->device,
++ "Enable DP local alpha for %s\n",
++ fbi->fix.id);
++ break;
++ }
++ case MXCFB_SET_LOC_ALP_BUF:
++ {
++ unsigned long base;
++ uint32_t ipu_alp_ch_irq;
++
++ if (!(((mxc_fbi->ipu_ch == MEM_FG_SYNC) ||
++ (mxc_fbi->ipu_ch == MEM_BG_SYNC)) &&
++ (mxc_fbi->alpha_chan_en))) {
++ dev_err(fbi->device,
++ "Should use background or overlay "
++ "framebuffer to set the alpha buffer "
++ "number\n");
++ return -EINVAL;
++ }
++
++ if (get_user(base, argp))
++ return -EFAULT;
++
++ if (base != mxc_fbi->alpha_phy_addr0 &&
++ base != mxc_fbi->alpha_phy_addr1) {
++ dev_err(fbi->device,
++ "Wrong alpha buffer physical address "
++ "%lu\n", base);
++ return -EINVAL;
++ }
++
++ if (mxc_fbi->ipu_ch == MEM_FG_SYNC)
++ ipu_alp_ch_irq = IPU_IRQ_FG_ALPHA_SYNC_EOF;
++ else
++ ipu_alp_ch_irq = IPU_IRQ_BG_ALPHA_SYNC_EOF;
++
++ down(&mxc_fbi->alpha_flip_sem);
++
++ mxc_fbi->cur_ipu_alpha_buf =
++ !mxc_fbi->cur_ipu_alpha_buf;
++ if (ipu_update_channel_buffer(mxc_fbi->ipu_ch,
++ IPU_ALPHA_IN_BUFFER,
++ mxc_fbi->
++ cur_ipu_alpha_buf,
++ base) == 0) {
++ ipu_select_buffer(mxc_fbi->ipu_ch,
++ IPU_ALPHA_IN_BUFFER,
++ mxc_fbi->cur_ipu_alpha_buf);
++ ipu_clear_irq(ipu_alp_ch_irq);
++ ipu_enable_irq(ipu_alp_ch_irq);
++ } else {
++ dev_err(fbi->device,
++ "Error updating %s SDC alpha buf %d "
++ "to address=0x%08lX\n",
++ fbi->fix.id,
++ mxc_fbi->cur_ipu_alpha_buf, base);
++ }
++ break;
++ }
++ case MXCFB_SET_CLR_KEY:
++ {
++ struct mxcfb_color_key key;
++ if (copy_from_user(&key, (void *)arg, sizeof(key))) {
++ retval = -EFAULT;
++ break;
++ }
++ retval = ipu_disp_set_color_key(mxc_fbi->ipu_ch,
++ key.enable,
++ key.color_key);
++ dev_dbg(fbi->device, "Set color key to 0x%08X\n",
++ key.color_key);
++ break;
++ }
++ case MXCFB_SET_GAMMA:
++ {
++ struct mxcfb_gamma gamma;
++ if (copy_from_user(&gamma, (void *)arg, sizeof(gamma))) {
++ retval = -EFAULT;
++ break;
++ }
++ retval = ipu_disp_set_gamma_correction(mxc_fbi->ipu_ch,
++ gamma.enable,
++ gamma.constk,
++ gamma.slopek);
++ break;
++ }
++ case MXCFB_WAIT_FOR_VSYNC:
++ {
++ if (mxc_fbi->ipu_ch == MEM_FG_SYNC) {
++ struct mxcfb_info *bg_mxcfbi = NULL;
++ int i;
++ for (i = 0; i < num_registered_fb; i++) {
++ bg_mxcfbi =
++ ((struct mxcfb_info *)(registered_fb[i]->par));
++
++ if (bg_mxcfbi->ipu_ch == MEM_BG_SYNC)
++ break;
++ }
++ if (bg_mxcfbi->cur_blank != FB_BLANK_UNBLANK) {
++ retval = -EINVAL;
++ break;
++ }
++ }
++ if (mxc_fbi->cur_blank != FB_BLANK_UNBLANK) {
++ retval = -EINVAL;
++ break;
++ }
++
++ init_completion(&mxc_fbi->vsync_complete);
++
++ ipu_clear_irq(mxc_fbi->ipu_ch_irq);
++ mxc_fbi->wait4vsync = 1;
++ ipu_enable_irq(mxc_fbi->ipu_ch_irq);
++ retval = wait_for_completion_interruptible_timeout(
++ &mxc_fbi->vsync_complete, 1 * HZ);
++ if (retval == 0) {
++ dev_err(fbi->device,
++ "MXCFB_WAIT_FOR_VSYNC: timeout %d\n",
++ retval);
++ mxc_fbi->wait4vsync = 0;
++ retval = -ETIME;
++ } else if (retval > 0) {
++ retval = 0;
++ }
++ break;
++ }
++ case FBIO_ALLOC:
++ {
++ int size;
++ struct mxcfb_alloc_list *mem;
++
++ mem = kzalloc(sizeof(*mem), GFP_KERNEL);
++ if (mem == NULL)
++ return -ENOMEM;
++
++ if (get_user(size, argp))
++ return -EFAULT;
++
++ mem->size = PAGE_ALIGN(size);
++
++ mem->cpu_addr = dma_alloc_coherent(fbi->device, size,
++ &mem->phy_addr,
++ GFP_DMA);
++ if (mem->cpu_addr == NULL) {
++ kfree(mem);
++ return -ENOMEM;
++ }
++
++ list_add(&mem->list, &fb_alloc_list);
++
++ dev_dbg(fbi->device, "allocated %d bytes @ 0x%08X\n",
++ mem->size, mem->phy_addr);
++
++ if (put_user(mem->phy_addr, argp))
++ return -EFAULT;
++
++ break;
++ }
++ case FBIO_FREE:
++ {
++ unsigned long offset;
++ struct mxcfb_alloc_list *mem;
++
++ if (get_user(offset, argp))
++ return -EFAULT;
++
++ retval = -EINVAL;
++ list_for_each_entry(mem, &fb_alloc_list, list) {
++ if (mem->phy_addr == offset) {
++ list_del(&mem->list);
++ dma_free_coherent(fbi->device,
++ mem->size,
++ mem->cpu_addr,
++ mem->phy_addr);
++ kfree(mem);
++ retval = 0;
++ break;
++ }
++ }
++
++ break;
++ }
++ case MXCFB_SET_OVERLAY_POS:
++ {
++ struct mxcfb_pos pos;
++ struct fb_info *bg_fbi = NULL;
++ struct mxcfb_info *bg_mxcfbi = NULL;
++ int i;
++
++ if (mxc_fbi->ipu_ch != MEM_FG_SYNC) {
++ dev_err(fbi->device, "Should use the overlay "
++ "framebuffer to set the position of "
++ "the overlay window\n");
++ retval = -EINVAL;
++ break;
++ }
++
++ if (copy_from_user(&pos, (void *)arg, sizeof(pos))) {
++ retval = -EFAULT;
++ break;
++ }
++
++ for (i = 0; i < num_registered_fb; i++) {
++ bg_mxcfbi =
++ ((struct mxcfb_info *)(registered_fb[i]->par));
++
++ if (bg_mxcfbi->ipu_ch == MEM_BG_SYNC) {
++ bg_fbi = registered_fb[i];
++ break;
++ }
++ }
++
++ if (bg_fbi == NULL) {
++ dev_err(fbi->device, "Cannot find the "
++ "background framebuffer\n");
++ retval = -ENOENT;
++ break;
++ }
++
++ if (fbi->var.xres + pos.x > bg_fbi->var.xres) {
++ if (bg_fbi->var.xres < fbi->var.xres)
++ pos.x = 0;
++ else
++ pos.x = bg_fbi->var.xres - fbi->var.xres;
++ }
++ if (fbi->var.yres + pos.y > bg_fbi->var.yres) {
++ if (bg_fbi->var.yres < fbi->var.yres)
++ pos.y = 0;
++ else
++ pos.y = bg_fbi->var.yres - fbi->var.yres;
++ }
++
++ retval = ipu_disp_set_window_pos(mxc_fbi->ipu_ch,
++ pos.x, pos.y);
++
++ if (copy_to_user((void *)arg, &pos, sizeof(pos))) {
++ retval = -EFAULT;
++ break;
++ }
++ break;
++ }
++ case MXCFB_GET_FB_IPU_CHAN:
++ {
++ struct mxcfb_info *mxc_fbi =
++ (struct mxcfb_info *)fbi->par;
++
++ if (put_user(mxc_fbi->ipu_ch, argp))
++ return -EFAULT;
++ break;
++ }
++ case MXCFB_GET_DIFMT:
++ {
++ struct mxcfb_info *mxc_fbi =
++ (struct mxcfb_info *)fbi->par;
++
++ if (put_user(mxc_fbi->ipu_di_pix_fmt, argp))
++ return -EFAULT;
++ break;
++ }
++ case MXCFB_GET_FB_IPU_DI:
++ {
++ struct mxcfb_info *mxc_fbi =
++ (struct mxcfb_info *)fbi->par;
++
++ if (put_user(mxc_fbi->ipu_di, argp))
++ return -EFAULT;
++ break;
++ }
++ case MXCFB_GET_FB_BLANK:
++ {
++ struct mxcfb_info *mxc_fbi =
++ (struct mxcfb_info *)fbi->par;
++
++ if (put_user(mxc_fbi->cur_blank, argp))
++ return -EFAULT;
++ break;
++ }
++ case MXCFB_SET_DIFMT:
++ {
++ struct mxcfb_info *mxc_fbi =
++ (struct mxcfb_info *)fbi->par;
++
++ if (get_user(mxc_fbi->ipu_di_pix_fmt, argp))
++ return -EFAULT;
++
++ break;
++ }
++ default:
++ retval = -EINVAL;
++ }
++ return retval;
++}
++
++/*
++ * mxcfb_blank():
++ * Blank the display.
++ */
++static int mxcfb_blank(int blank, struct fb_info *info)
++{
++ struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)info->par;
++
++ dev_dbg(info->device, "blank = %d\n", blank);
++
++ if (mxc_fbi->cur_blank == blank)
++ return 0;
++
++ mxc_fbi->next_blank = blank;
++
++ switch (blank) {
++ case FB_BLANK_POWERDOWN:
++ case FB_BLANK_VSYNC_SUSPEND:
++ case FB_BLANK_HSYNC_SUSPEND:
++ case FB_BLANK_NORMAL:
++ ipu_disable_channel(mxc_fbi->ipu_ch, true);
++ ipu_uninit_sync_panel(mxc_fbi->ipu_di);
++ ipu_uninit_channel(mxc_fbi->ipu_ch);
++ break;
++ case FB_BLANK_UNBLANK:
++ mxcfb_set_par(info);
++ break;
++ }
++ mxc_fbi->cur_blank = blank;
++ return 0;
++}
++
++/*
++ * Pan or Wrap the Display
++ *
++ * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
++ *
++ * @param var Variable screen buffer information
++ * @param info Framebuffer information pointer
++ */
++static int
++mxcfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
++{
++ struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)info->par,
++ *mxc_graphic_fbi = NULL;
++ u_int y_bottom;
++ unsigned long base, active_alpha_phy_addr = 0;
++ bool loc_alpha_en = false;
++ int i = 0;
++
++ if (info->var.yoffset == var->yoffset)
++ return 0; /* No change, do nothing */
++
++ /* no pan display during fb blank */
++ if (mxc_fbi->ipu_ch == MEM_FG_SYNC) {
++ struct mxcfb_info *bg_mxcfbi = NULL;
++ int j;
++ for (j = 0; j < num_registered_fb; j++) {
++ bg_mxcfbi =
++ ((struct mxcfb_info *)(registered_fb[j]->par));
++
++ if (bg_mxcfbi->ipu_ch == MEM_BG_SYNC)
++ break;
++ }
++ if (bg_mxcfbi->cur_blank != FB_BLANK_UNBLANK)
++ return -EINVAL;
++ }
++ if (mxc_fbi->cur_blank != FB_BLANK_UNBLANK)
++ return -EINVAL;
++
++ y_bottom = var->yoffset;
++
++ if (!(var->vmode & FB_VMODE_YWRAP))
++ y_bottom += var->yres;
++
++ if (y_bottom > info->var.yres_virtual)
++ return -EINVAL;
++
++ base = (var->yoffset * var->xres_virtual + var->xoffset);
++ base = (var->bits_per_pixel) * base / 8;
++ base += info->fix.smem_start;
++
++ /* Check if DP local alpha is enabled and find the graphic fb */
++ if (mxc_fbi->ipu_ch == MEM_BG_SYNC || mxc_fbi->ipu_ch == MEM_FG_SYNC) {
++ for (i = 0; i < num_registered_fb; i++) {
++ char *idstr = registered_fb[i]->fix.id;
++ if ((strcmp(idstr, "DISP3 BG") == 0 ||
++ strcmp(idstr, "DISP3 FG") == 0) &&
++ ((struct mxcfb_info *)
++ (registered_fb[i]->par))->alpha_chan_en) {
++ loc_alpha_en = true;
++ mxc_graphic_fbi = (struct mxcfb_info *)
++ (registered_fb[i]->par);
++ active_alpha_phy_addr =
++ mxc_fbi->cur_ipu_alpha_buf ?
++ mxc_graphic_fbi->alpha_phy_addr1 :
++ mxc_graphic_fbi->alpha_phy_addr0;
++ dev_dbg(info->device, "Updating SDC alpha "
++ "buf %d address=0x%08lX\n",
++ !mxc_fbi->cur_ipu_alpha_buf,
++ active_alpha_phy_addr);
++ break;
++ }
++ }
++ }
++
++ down(&mxc_fbi->flip_sem);
++
++ mxc_fbi->cur_ipu_buf = (++mxc_fbi->cur_ipu_buf) % 3;
++ mxc_fbi->cur_ipu_alpha_buf = !mxc_fbi->cur_ipu_alpha_buf;
++
++ dev_dbg(info->device, "Updating SDC %s buf %d address=0x%08lX\n",
++ info->fix.id, mxc_fbi->cur_ipu_buf, base);
++
++ if (ipu_update_channel_buffer(mxc_fbi->ipu_ch, IPU_INPUT_BUFFER,
++ mxc_fbi->cur_ipu_buf, base) == 0) {
++ /* Update the DP local alpha buffer only for graphic plane */
++ if (loc_alpha_en && mxc_graphic_fbi == mxc_fbi &&
++ ipu_update_channel_buffer(mxc_graphic_fbi->ipu_ch,
++ IPU_ALPHA_IN_BUFFER,
++ mxc_fbi->cur_ipu_alpha_buf,
++ active_alpha_phy_addr) == 0) {
++ ipu_select_buffer(mxc_graphic_fbi->ipu_ch,
++ IPU_ALPHA_IN_BUFFER,
++ mxc_fbi->cur_ipu_alpha_buf);
++ }
++
++ ipu_select_buffer(mxc_fbi->ipu_ch, IPU_INPUT_BUFFER,
++ mxc_fbi->cur_ipu_buf);
++ ipu_clear_irq(mxc_fbi->ipu_ch_irq);
++ ipu_enable_irq(mxc_fbi->ipu_ch_irq);
++ } else {
++ dev_err(info->device,
++ "Error updating SDC buf %d to address=0x%08lX, "
++ "current buf %d, buf0 ready %d, buf1 ready %d, "
++ "buf2 ready %d\n", mxc_fbi->cur_ipu_buf, base,
++ ipu_get_cur_buffer_idx(mxc_fbi->ipu_ch,
++ IPU_INPUT_BUFFER),
++ ipu_check_buffer_ready(mxc_fbi->ipu_ch,
++ IPU_INPUT_BUFFER, 0),
++ ipu_check_buffer_ready(mxc_fbi->ipu_ch,
++ IPU_INPUT_BUFFER, 1),
++ ipu_check_buffer_ready(mxc_fbi->ipu_ch,
++ IPU_INPUT_BUFFER, 2));
++ mxc_fbi->cur_ipu_buf = (++mxc_fbi->cur_ipu_buf) % 3;
++ mxc_fbi->cur_ipu_buf = (++mxc_fbi->cur_ipu_buf) % 3;
++ mxc_fbi->cur_ipu_alpha_buf = !mxc_fbi->cur_ipu_alpha_buf;
++ ipu_clear_irq(mxc_fbi->ipu_ch_irq);
++ ipu_enable_irq(mxc_fbi->ipu_ch_irq);
++ return -EBUSY;
++ }
++
++ dev_dbg(info->device, "Update complete\n");
++
++ info->var.yoffset = var->yoffset;
++
++ return 0;
++}
++
++/*
++ * Function to handle custom mmap for MXC framebuffer.
++ *
++ * @param fbi framebuffer information pointer
++ *
++ * @param vma Pointer to vm_area_struct
++ */
++static int mxcfb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
++{
++ bool found = false;
++ u32 len;
++ unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
++ struct mxcfb_alloc_list *mem;
++ struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par;
++
++ if (offset < fbi->fix.smem_len) {
++ /* mapping framebuffer memory */
++ len = fbi->fix.smem_len - offset;
++ vma->vm_pgoff = (fbi->fix.smem_start + offset) >> PAGE_SHIFT;
++ } else if ((vma->vm_pgoff ==
++ (mxc_fbi->alpha_phy_addr0 >> PAGE_SHIFT)) ||
++ (vma->vm_pgoff ==
++ (mxc_fbi->alpha_phy_addr1 >> PAGE_SHIFT))) {
++ len = mxc_fbi->alpha_mem_len;
++ } else {
++ list_for_each_entry(mem, &fb_alloc_list, list) {
++ if (offset == mem->phy_addr) {
++ found = true;
++ len = mem->size;
++ break;
++ }
++ }
++ if (!found)
++ return -EINVAL;
++ }
++
++ len = PAGE_ALIGN(len);
++ if (vma->vm_end - vma->vm_start > len)
++ return -EINVAL;
++
++ /* make buffers bufferable */
++ vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
++
++ vma->vm_flags |= VM_IO | VM_RESERVED;
++
++ if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
++ vma->vm_end - vma->vm_start, vma->vm_page_prot)) {
++ dev_dbg(fbi->device, "mmap remap_pfn_range failed\n");
++ return -ENOBUFS;
++ }
++
++ return 0;
++}
++
++/*!
++ * This structure contains the pointers to the control functions that are
++ * invoked by the core framebuffer driver to perform operations like
++ * blitting, rectangle filling, copy regions and cursor definition.
++ */
++static struct fb_ops mxcfb_ops = {
++ .owner = THIS_MODULE,
++ .fb_set_par = mxcfb_set_par,
++ .fb_check_var = mxcfb_check_var,
++ .fb_setcolreg = mxcfb_setcolreg,
++ .fb_pan_display = mxcfb_pan_display,
++ .fb_ioctl = mxcfb_ioctl,
++ .fb_mmap = mxcfb_mmap,
++ .fb_fillrect = cfb_fillrect,
++ .fb_copyarea = cfb_copyarea,
++ .fb_imageblit = cfb_imageblit,
++ .fb_blank = mxcfb_blank,
++};
++
++static irqreturn_t mxcfb_irq_handler(int irq, void *dev_id)
++{
++ struct fb_info *fbi = dev_id;
++ struct mxcfb_info *mxc_fbi = fbi->par;
++
++ if (mxc_fbi->wait4vsync) {
++ complete(&mxc_fbi->vsync_complete);
++ ipu_disable_irq(irq);
++ mxc_fbi->wait4vsync = 0;
++ } else {
++ up(&mxc_fbi->flip_sem);
++ ipu_disable_irq(irq);
++ }
++ return IRQ_HANDLED;
++}
++
++static irqreturn_t mxcfb_alpha_irq_handler(int irq, void *dev_id)
++{
++ struct fb_info *fbi = dev_id;
++ struct mxcfb_info *mxc_fbi = fbi->par;
++
++ up(&mxc_fbi->alpha_flip_sem);
++ ipu_disable_irq(irq);
++ return IRQ_HANDLED;
++}
++
++/*
++ * Suspends the framebuffer and blanks the screen. Power management support
++ */
++static int mxcfb_suspend(struct platform_device *pdev, pm_message_t state)
++{
++ struct fb_info *fbi = platform_get_drvdata(pdev);
++ struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par;
++ int saved_blank;
++
++ console_lock();
++ fb_set_suspend(fbi, 1);
++ saved_blank = mxc_fbi->cur_blank;
++ mxcfb_blank(FB_BLANK_POWERDOWN, fbi);
++ mxc_fbi->next_blank = saved_blank;
++ mxc_fbi->fb_suspended = true;
++ console_unlock();
++
++ return 0;
++}
++
++/*
++ * Resumes the framebuffer and unblanks the screen. Power management support
++ */
++static int mxcfb_resume(struct platform_device *pdev)
++{
++ struct fb_info *fbi = platform_get_drvdata(pdev);
++ struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par;
++
++ console_lock();
++ mxc_fbi->fb_suspended = false;
++ mxcfb_blank(mxc_fbi->next_blank, fbi);
++ fb_set_suspend(fbi, 0);
++ console_unlock();
++
++ return 0;
++}
++
++/*
++ * Main framebuffer functions
++ */
++
++/*!
++ * Allocates the DRAM memory for the frame buffer. This buffer is remapped
++ * into a non-cached, non-buffered, memory region to allow palette and pixel
++ * writes to occur without flushing the cache. Once this area is remapped,
++ * all virtual memory access to the video memory should occur at the new region.
++ *
++ * @param fbi framebuffer information pointer
++ *
++ * @return Error code indicating success or failure
++ */
++static int mxcfb_map_video_memory(struct fb_info *fbi)
++{
++ if (fbi->fix.smem_len < fbi->var.yres_virtual * fbi->fix.line_length)
++ fbi->fix.smem_len = fbi->var.yres_virtual *
++ fbi->fix.line_length;
++
++ fbi->screen_base = dma_alloc_writecombine(fbi->device,
++ fbi->fix.smem_len,
++ (dma_addr_t *)&fbi->fix.smem_start,
++ GFP_DMA);
++ if (fbi->screen_base == 0) {
++ dev_err(fbi->device, "Unable to allocate framebuffer memory\n");
++ fbi->fix.smem_len = 0;
++ fbi->fix.smem_start = 0;
++ return -EBUSY;
++ }
++
++ dev_dbg(fbi->device, "allocated fb @ paddr=0x%08X, size=%d.\n",
++ (uint32_t) fbi->fix.smem_start, fbi->fix.smem_len);
++
++ fbi->screen_size = fbi->fix.smem_len;
++
++ /* Clear the screen */
++ memset((char *)fbi->screen_base, 0, fbi->fix.smem_len);
++
++ return 0;
++}
++
++/*!
++ * De-allocates the DRAM memory for the frame buffer.
++ *
++ * @param fbi framebuffer information pointer
++ *
++ * @return Error code indicating success or failure
++ */
++static int mxcfb_unmap_video_memory(struct fb_info *fbi)
++{
++ dma_free_writecombine(fbi->device, fbi->fix.smem_len,
++ fbi->screen_base, fbi->fix.smem_start);
++ fbi->screen_base = 0;
++ fbi->fix.smem_start = 0;
++ fbi->fix.smem_len = 0;
++ return 0;
++}
++
++/*!
++ * Initializes the framebuffer information pointer. After allocating
++ * sufficient memory for the framebuffer structure, the fields are
++ * filled with custom information passed in from the configurable
++ * structures. This includes information such as bits per pixel,
++ * color maps, screen width/height and RGBA offsets.
++ *
++ * @return Framebuffer structure initialized with our information
++ */
++static struct fb_info *mxcfb_init_fbinfo(struct device *dev, struct fb_ops *ops)
++{
++ struct fb_info *fbi;
++ struct mxcfb_info *mxcfbi;
++
++ /*
++ * Allocate sufficient memory for the fb structure
++ */
++ fbi = framebuffer_alloc(sizeof(struct mxcfb_info), dev);
++ if (!fbi)
++ return NULL;
++
++ mxcfbi = (struct mxcfb_info *)fbi->par;
++
++ fbi->var.activate = FB_ACTIVATE_NOW;
++
++ fbi->fbops = ops;
++ fbi->flags = FBINFO_FLAG_DEFAULT;
++ fbi->pseudo_palette = mxcfbi->pseudo_palette;
++
++ /*
++ * Allocate colormap
++ */
++ fb_alloc_cmap(&fbi->cmap, 16, 0);
++
++ return fbi;
++}
++
++static ssize_t show_disp_chan(struct device *dev,
++ struct device_attribute *attr, char *buf)
++{
++ struct fb_info *info = dev_get_drvdata(dev);
++ struct mxcfb_info *mxcfbi = (struct mxcfb_info *)info->par;
++
++ if (mxcfbi->ipu_ch == MEM_BG_SYNC)
++ return sprintf(buf, "2-layer-fb-bg\n");
++ else if (mxcfbi->ipu_ch == MEM_FG_SYNC)
++ return sprintf(buf, "2-layer-fb-fg\n");
++ else if (mxcfbi->ipu_ch == MEM_DC_SYNC)
++ return sprintf(buf, "1-layer-fb\n");
++ else
++ return sprintf(buf, "err: no display chan\n");
++}
++
++static ssize_t swap_disp_chan(struct device *dev,
++ struct device_attribute *attr,
++ const char *buf, size_t count)
++{
++ struct fb_info *info = dev_get_drvdata(dev);
++ struct mxcfb_info *mxcfbi = (struct mxcfb_info *)info->par;
++ struct mxcfb_info *fg_mxcfbi = NULL;
++
++ console_lock();
++ /* swap only happen between DP-BG and DC, while DP-FG disable */
++ if (((mxcfbi->ipu_ch == MEM_BG_SYNC) &&
++ (strstr(buf, "1-layer-fb") != NULL)) ||
++ ((mxcfbi->ipu_ch == MEM_DC_SYNC) &&
++ (strstr(buf, "2-layer-fb-bg") != NULL))) {
++ int i;
++
++ for (i = 0; i < num_registered_fb; i++) {
++ fg_mxcfbi =
++ (struct mxcfb_info *)mxcfb_info[i]->par;
++ if (fg_mxcfbi->ipu_ch == MEM_FG_SYNC)
++ break;
++ else
++ fg_mxcfbi = NULL;
++ }
++ ...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2012-04-03 12:12:41
|
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 a78dfc0f15e3d66e47443e9b2e54d412e0c92e11 (commit)
via e83e8e435ebcd62821f56021355b5fba36de44e9 (commit)
via a51ef65855e054f5390f93ae893933e386eef253 (commit)
from db1bb3b7584999ce7b65c73b4772aa00dc1bc0b3 (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 a78dfc0f15e3d66e47443e9b2e54d412e0c92e11
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 3 14:23:35 2012 +0200
[BUILDROOT] BR 2012.02-rc1 patch cleanup
commit e83e8e435ebcd62821f56021355b5fba36de44e9
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 3 14:20:21 2012 +0200
[BUILDROOT] cleanup: delete patch 051b and set the board uboot board name in the Br config files
commit a51ef65855e054f5390f93ae893933e386eef253
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 3 13:23:26 2012 +0200
[UBOOT] use the default U-Boot filename: u-boot-nand.bin and add the board prefix apfXX-
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 1 +
buildroot/configs/apf27_webradio_defconfig | 1 +
buildroot/configs/apf27test_defconfig | 1 +
buildroot/configs/apf28_defconfig | 1 +
buildroot/configs/apf51_defconfig | 1 +
buildroot/configs/apf51test_defconfig | 1 +
buildroot/configs/apf9328_defconfig | 1 +
buildroot/configs/apf9328test_defconfig | 1 +
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 6 +++---
.../device/armadeus/apf51/apf51-u-boot-2011.12.h | 6 +++---
.../device/armadeus/pps/pps-u-boot-2011.12.h | 6 +++---
patches/buildroot/2012.02-rc1 | 1 -
...1b-u-boot-change_board_name_default_value.patch | 14 --------------
13 files changed, 17 insertions(+), 24 deletions(-)
delete mode 120000 patches/buildroot/2012.02-rc1
delete mode 100644 patches/buildroot/2012.02/051b-u-boot-change_board_name_default_value.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 0db0544..bf4b714 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -65,6 +65,7 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
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-2011.12.tar.bz2"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index b4bf6c7..13a7ee9 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -73,6 +73,7 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
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-2011.12.tar.bz2"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 4cbe945..bed5351 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -126,6 +126,7 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
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-2011.12.tar.bz2"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 56ed6ef..c941a8d 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -61,6 +61,7 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
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-2011.12.tar.bz2"
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 72733b6..a214580 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -71,6 +71,7 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
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-2011.12.tar.bz2"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 855e357..1c19f89 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -143,6 +143,7 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
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-2011.12.tar.bz2"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index f1e9fa9..2dd5d6d 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -56,6 +56,7 @@ BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_JFFS2=y
BR2_TARGET_ROOTFS_JFFS2_PAD=y
BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
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-2011.12.tar.bz2"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index dad8fa9..266990c 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -99,6 +99,7 @@ BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_JFFS2=y
BR2_TARGET_ROOTFS_JFFS2_PAD=y
BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
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-2011.12.tar.bz2"
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 8bafce3..cb3f83d 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
@@ -24,8 +24,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "2.2"
-#define CONFIG_IDENT_STRING " apf27 patch 2.9"
+#define CONFIG_ENV_VERSION "2.3"
+#define CONFIG_IDENT_STRING " apf27 patch 2.10"
#define CONFIG_BOARD_NAME apf27
/*
@@ -275,7 +275,7 @@
"flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-u-boot.bin\0" \
+ " ${serverpath}${board_name}-u-boot-nand.bin\0" \
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
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 a96665c..929b366 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
@@ -24,8 +24,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.8"
-#define CONFIG_IDENT_STRING " apf51 patch 0.10"
+#define CONFIG_ENV_VERSION "0.9"
+#define CONFIG_IDENT_STRING " apf51 patch 0.11"
#define CONFIG_BOARD_NAME apf51
/*
@@ -267,7 +267,7 @@
"flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-u-boot.bin\0" \
+ " ${serverpath}${board_name}-u-boot-nand.bin\0" \
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
index ab5595f..ab5baf9 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
@@ -24,8 +24,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "2.2"
-#define CONFIG_IDENT_STRING " pps patch 2.9"
+#define CONFIG_ENV_VERSION "2.3"
+#define CONFIG_IDENT_STRING " pps patch 2.10"
#define CONFIG_BOARD_NAME pps
/*
@@ -275,7 +275,7 @@
"flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-u-boot.bin\0" \
+ " ${serverpath}${board_name}-u-boot-nand.bin\0" \
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
diff --git a/patches/buildroot/2012.02-rc1 b/patches/buildroot/2012.02-rc1
deleted file mode 120000
index ef847b1..0000000
--- a/patches/buildroot/2012.02-rc1
+++ /dev/null
@@ -1 +0,0 @@
-2012.02
\ No newline at end of file
diff --git a/patches/buildroot/2012.02/051b-u-boot-change_board_name_default_value.patch b/patches/buildroot/2012.02/051b-u-boot-change_board_name_default_value.patch
deleted file mode 100644
index e3b92b6..0000000
--- a/patches/buildroot/2012.02/051b-u-boot-change_board_name_default_value.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Signed-off-by: Eric Jarrige <eri...@ar...>
-
-Index: buildroot/boot/uboot/Config.in
-===================================================================
---- buildroot.orig/boot/uboot/Config.in 2012-02-21 16:43:28.000000000 +0100
-+++ buildroot/boot/uboot/Config.in 2012-02-21 16:44:24.000000000 +0100
-@@ -6,6 +6,7 @@
- if BR2_TARGET_UBOOT
- config BR2_TARGET_UBOOT_BOARDNAME
- string "U-Boot board name"
-+ default "$(BR2_BOARD_NAME)"
- help
- One of U-Boot supported boards to be built.
- This will be suffixed with _config to meet U-Boot standard naming.
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-04-02 23:35:41
|
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 db1bb3b7584999ce7b65c73b4772aa00dc1bc0b3 (commit)
from 4aefb2f3e1f6e2c99fe299d9ae52e52a8d21e908 (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 db1bb3b7584999ce7b65c73b4772aa00dc1bc0b3
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 3 01:46:54 2012 +0200
[BUILDROOT] remove the never released U-Boot 2011.06 patches that are now deprecated with U-Boot 2011.12
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf9328/apf9328-u-boot-2010.03.h | 1018 ---------------
.../armadeus/apf9328/apf9328-u-boot-2011.06.h | 1034 ---------------
patches/u-boot/2011.06/01-mx1-gpio-mode.patch | 27 -
patches/u-boot/2011.06/02-mx1-i2c.patch | 42 -
patches/u-boot/2011.06/03-apf9328.patch | 1328 --------------------
patches/u-boot/2011.06/04-apf9328-makefile.patch | 50 -
patches/u-boot/2011.06/05-apf9328-config.patch | 1049 ----------------
patches/u-boot/2011.06/06-mx1-pllclk.patch | 59 -
patches/u-boot/2011.06/07-mx1-pllclk-debug.patch | 22 -
patches/u-boot/2011.06/08-DM9000.patch | 44 -
patches/u-boot/2011.06/09-mx1-relocation.patch | 29 -
patches/u-boot/2011.06/series | 10 -
12 files changed, 0 insertions(+), 4712 deletions(-)
delete mode 100644 buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2010.03.h
delete mode 100644 buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
delete mode 100644 patches/u-boot/2011.06/01-mx1-gpio-mode.patch
delete mode 100644 patches/u-boot/2011.06/02-mx1-i2c.patch
delete mode 100644 patches/u-boot/2011.06/03-apf9328.patch
delete mode 100644 patches/u-boot/2011.06/04-apf9328-makefile.patch
delete mode 100644 patches/u-boot/2011.06/05-apf9328-config.patch
delete mode 100644 patches/u-boot/2011.06/06-mx1-pllclk.patch
delete mode 100644 patches/u-boot/2011.06/07-mx1-pllclk-debug.patch
delete mode 100644 patches/u-boot/2011.06/08-DM9000.patch
delete mode 100644 patches/u-boot/2011.06/09-mx1-relocation.patch
delete mode 100644 patches/u-boot/2011.06/series
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2010.03.h
deleted file mode 100644
index af8cb69..0000000
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2010.03.h
+++ /dev/null
@@ -1,1018 +0,0 @@
-/*
- * Eric Jarrige <jo...@us...>
- *
- * Configuration settings for the Armadeus Project motherboard 9328 board.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- *
- * 2005/01/14 Initial version taken from the scb9328 configuration file
- * 2005/03/10 apf9328 configuration file and trial to improve of
- * hardware register control.
- * 2005/08/16 added APF9328 fpgas and ethernet
- * 2005/12/02 added filesystem boot over NFS
- * 2006/11/26 added filesystem boot over NFS
- * 2010/03/28 U-Boot 2010.03 migration + change timer unit to ms (fixme)
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "3.7"
-#define CONFIG_IDENT_STRING " apf9328 patch 4.0"
-
-#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
-#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
-#define CONFIG_apf9328 1 /* on a Armadeus project board */
-#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
-
-/*
- * Enable the call to misc_init_r() for miscellaneous platform
- * dependent initialization.
- */
-
-#define CONFIG_MISC_INIT_R
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_DNS2
-
-/*
- * Select serial console configuration
- */
-#define CONFIG_IMX_SERIAL
-#define CONFIG_IMX_SERIAL1
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_BAUDRATE 115200
-
-/*
- * 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.
- */
-
-#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_DHCP /* DHCP Support */
-#define CONFIG_CMD_DIAG /* Diagnostics */
-#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
-//#define CONFIG_CMD_FAT /* FAT support */
-#define CONFIG_CMD_FLASH /* flinfo, erase, protect */
-#define CONFIG_CMD_I2C /* I2C serial bus support */
-#define 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_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_NFS
-#define CONFIG_CMD_DNS
-
-#undef CONFIG_DISPLAY_BOARDINFO
-#undef CONFIG_DISPLAY_CPUINFO
-
-/*
- * Select some advanced features of the commande line parser
- */
-#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_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
-#define CONFIG_CMDLINE_EDITING 1
-
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-/*
- * Boot options. Setting delay to -1 stops autostart count down.
- */
-#define CONFIG_BOOTDELAY 20
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
-#define CONFIG_BOOTARGS \
- CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
-
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)"n8"
-#define CONFIG_MTDMAP "physmap-flash.0"
-#define MTDIDS_DEFAULT "nor0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":256k(U-boot)ro," \
- "128k(U-boot_env),256k(firmware),2048k(kernel),-(rootfs)"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "env_version=" CONFIG_ENV_VERSION "\0" \
- "fileaddr=" MK_STR(CONFIG_SYS_LOAD_ADDR) "\0" \
- "filesize=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
- "console=" CONFIG_CONSOLE "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
- "partition=nor0,4\0" \
- "uboot_addr=" MK_STR(CONFIG_SYS_MONITOR_BASE) "\0" \
- "uboot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
- "env_addr=" MK_STR(CONFIG_ENV_ADDR) "\0" \
- "env_len=" MK_STR(CONFIG_ENV_SIZE) "\0" \
- "firmware_addr=" MK_STR(CONFIG_FIRMWARE_ADDR) "\0" \
- "firmware_len=" MK_STR(CONFIG_FIRMWARE_LEN) "\0" \
- "kernel_addr=" MK_STR(CONFIG_KERNEL_ADDR) "\0" \
- "kernel_len=" MK_STR(CONFIG_KERNEL_LEN) "\0" \
- "rootfs_addr=" MK_STR(CONFIG_ROOTFS_ADDR) "\0" \
- "rootfs_len=" MK_STR(CONFIG_ROOTFS_LEN) "\0" \
- "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
- "serverpath=" MK_STR(CONFIG_SRV_PATH) "\0" \
- "ntpserverip=217.147.208.1\0" \
- "mmcroot=/dev/mmcblk0p1\0" \
- "mmcrootfstype=ext2\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} " \
- "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
- "addipargs=setenv bootargs ${bootargs} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off \0"\
- "nfsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addnfsargs addipargs; bootm ${kernel_addr}\0" \
- "jffsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addjffsargs addipargs; bootm ${kernel_addr}\0" \
- "ubifsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addubifsargs addipargs; bootm ${kernel_addr}\0" \
- "mmcboot=setenv bootargs ${console} ${mtdparts};" \
- "run addmmcargs addipargs; bootm ${kernel_addr}\0" \
- "firmware_autoload=0\0" \
- "flash_uboot=protect off ${uboot_addr} +${uboot_len};" \
- "echo Erasing FLASH;" \
- "era ${uboot_addr} +${uboot_len};" \
- "if cp.b ${fileaddr} ${uboot_addr} ${filesize};" \
- "then protect on ${uboot_addr} +${uboot_len};" \
- "echo Flashing of uboot succeed;" \
- "else echo Flashing of uboot failed;" \
- "fi; \0" \
- "flash_firmware=echo Erasing FLASH;" \
- "era ${firmware_addr} +${firmware_len};" \
- "if cp.b ${fileaddr} ${firmware_addr} ${filesize} ;" \
- "then echo Flashing of Firmware succeed;" \
- "else echo Flashing of Firmware failed;" \
- "fi\0" \
- "flash_kernel=echo Erasing FLASH;" \
- "era ${kernel_addr} +${kernel_len};" \
- "if cp.b ${fileaddr} ${kernel_addr} ${filesize} ;" \
- "then echo Flashing of kernel succeed;" \
- "else echo Flashing of kernel failed;" \
- "fi\0" \
- "flash_rootfs=echo Erasing FLASH;" \
- "era ${rootfs_addr} +${rootfs_len};" \
- "if cp.b ${fileaddr} ${rootfs_addr} ${filesize};" \
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
- "fi\0" \
- "flash_reset_env=protect off ${env_addr} +${env_len};" \
- "era ${env_addr} +${env_len};" \
- "echo Erasing of flash environment variables done!\0" \
- "download_uboot=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-u-boot.bin\0" \
- "download_kernel=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-linux.bin\0" \
- "download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.jffs2\0" \
- "update_uboot=run download_uboot flash_uboot\0" \
- "update_kernel=run download_kernel flash_kernel\0" \
- "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 00200008 0; mw 00210008 0\0" \
-
-#define CONFIG_BOOTCOMMAND "run jffsboot"
-#define CONFIG_SYS_AUTOLOAD "no"
-
-#define CONFIG_MACH_TYPE MACH_TYPE_APF9328
-#define CONFIG_BOOT_PARAMS_ADDR 0x08000100
-
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
-#define CONFIG_ETHADDR
-#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_IPADDR 192.168.000.10
-#define CONFIG_BOARD_NAME "apf9328"
-#define CONFIG_HOSTNAME "apf9328"
-#define CONFIG_GATEWAYIP 192.168.000.1
-#define CONFIG_SERVERIP 192.168.000.2
-#define CONFIG_SRV_PATH ""
-#define CONFIG_ROOTPATH "/tftpboot/apf9328-root"
-
-/*
- * General options for u-boot. Modify to save memory foot print
- */
-
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
-#define CONFIG_SYS_CBSIZE 256 /* 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 0x08000000 /* memtest test area */
-#define CONFIG_SYS_MEMTEST_END 0x08700000
-
-#define CONFIG_SYS_HZ 1000l /* incrementer freq: 1 MHz */
-
-/*
- * Definitions related to passing arguments to kernel.
- */
-
-#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 */
-
-/*
- * Malloc pool need to host env + 128 Kb reserve for other allocations.
- */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) )
-
-#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
-
-#define CONFIG_STACKSIZE (120<<10) /* stack size */
-
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ (4<<10) /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ (4<<10) /* FIQ stack */
-#endif
-
-/*
-* Clocks configuration
-*/
-/*
- * PLL configuration
-
- f_{dpll}=2*f{ref}*(MFI+MFN/(MFD+1))/(PD+1)
- f_ref=16,777216MHz
- 32768 Hz xtal
- 0x07B32DA5: 192.0000173
- 0x002a141f: 191,9944MHz
- 0x040b2007: 144MHz
- 0x0FB32DA5: 96.00000864 MHz
- 0x042a141f: 96MHz
- 0x0811140d: 64MHz
- 0x040e200e: 150MHz
- 0x00321431: 200MHz
-
- 16 MHz xtal
- 0x08001800: 64MHz mit 16er Quarz
- 0x04001800: 96MHz mit 16er Quarz
- 0x04002400: 144MHz mit 16er Quarz
-
- 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
- |XXX|--PD---|-------MFD---------|XXX|--MFI--|-----MFN-----------|
- */
-
-#define CONFIG_SYS_OSC32 32768 /* 32768 or 32000 Hz crystal */
-#undef CONFIG_SYS_OSC16 /* there is no external 16MHz external clock */
-
-/* MPU CLOCK source before PLL (should be named CONFIG_SYS_SYS_CLK_FREQ) */
-#define CONFIG_SYS_CLK_FREQ (512*CONFIG_SYS_OSC32)
-#define CONFIG_SYS_MPCTL0_VAL 0x07B32DA5 /* 192.000017 MHz */
-#define CONFIG_SYS_MPCTL1_VAL 0
-
-/* system clock source before PLL (should be named CONFIG_SYS_SYSPLL_CLK_FREQ) */
-#ifndef CONFIG_SYS_OSC16
-#define CONFIG_SYSPLL_CLK_FREQ (512*CONFIG_SYS_OSC32)
-#if (CONFIG_SYS_OSC32 == 32000)
-#define CONFIG_SYS_SPCTL0_VAL 0x043F1437 /* 96 MHz */
-#define CONFIG_SYS_SPCTL1_VAL 0
-#define CONFIG_SYS_FREQ 96 /* MHz */
-#else /* CONFIG_SYS_OSC32 == 32768*/
-#define CONFIG_SYS_SPCTL0_VAL 0x0FB32DA5 /* 96.000009 MHz */
-#define CONFIG_SYS_SPCTL1_VAL 0
-#define CONFIG_SYS_FREQ 96 /* MHz */
-#endif /* CONFIG_SYS_OSC32 */
-#else /* CONFIG_SYS_OSC16 in use*/
-#define CONFIG_SYSPLL_CLK_FREQ CONFIG_SYS_OSC16
-#define CONFIG_SYS_SPCTL0_VAL 0x04001401 /* 96 MHz */
-#define CONFIG_SYS_SPCTL1_VAL 0x0C000040
-#define CONFIG_SYS_FREQ 96 /* MHz */
-#endif /* CONFIG_SYS_OSC16 */
-
-/* external bus frequency (have to be a CONFIG_SYS_FREQ ratio) */
-#define CONFIG_SYS_BUS_FREQ 96 /* 96|48... MHz (BCLOCK and HCLOCK) */
-#define CONFIG_USB_FREQ 48 /* 48 MHz */
-#define CONFIG_PERIF1_FREQ 16 /* 16 MHz UART, Timer PWM*/
-#define CONFIG_PERIF2_FREQ 48 /* 48 MHz LCD SD SPI*/
-#define CONFIG_PERIF3_FREQ 16 /* 16 MHz SSI*/
-
-
-/*
- * SDRAM definition parameter
- */
-#define CONFIG_NR_DRAM_BANKS 1 /* we have and support only 1 bank of SDRAM */
-
-#define CONFIG_SYS_SDRAM_MBYTE_SYZE 16
-
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 8)
-/* micron 8MB */
-#define CONFIG_SYS_SDRAM_1_BASE 0x08000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_1_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 2 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1 20 /* ns clock cycle time when CL=1 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY 20 /* ns SRP */
-#define CONFIG_SYS_SDRAM_ROW_2_COL_DELAY 20 /* ns SRCD */
-#define CONFIG_SYS_SDRAM_ROW_CYCLE_DELAY 70 /* ns SRC */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 16)
-/* micron 16MB */
-#define CONFIG_SYS_SDRAM_1_BASE 0x08000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_1_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 2 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1 20 /* ns clock cycle time when CL=1 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY 20 /* ns SRP */
-#define CONFIG_SYS_SDRAM_ROW_2_COL_DELAY 20 /* ns SRCD */
-#define CONFIG_SYS_SDRAM_ROW_CYCLE_DELAY 70 /* ns SRC */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 32)
-/* micron 32MB */
-#define CONFIG_SYS_SDRAM_1_BASE 0x08000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_1_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 2 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1 20 /* ns clock cycle time when CL=1 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY 20 /* ns SRP */
-#define CONFIG_SYS_SDRAM_ROW_2_COL_DELAY 20 /* ns SRCD */
-#define CONFIG_SYS_SDRAM_ROW_CYCLE_DELAY 70 /* ns SRC */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 64)
-/* micron 64MB */
-#define CONFIG_SYS_SDRAM_1_BASE 0x08000000 /* SDRAM bank #1 32bits */
-#define CONFIG_SYS_SDRAM_1_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 */
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1 20 /* ns clock cycle time when CL=1 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY 20 /* ns SRP */
-#define CONFIG_SYS_SDRAM_ROW_2_COL_DELAY 20 /* ns SRCD */
-#define CONFIG_SYS_SDRAM_ROW_CYCLE_DELAY 70 /* ns SRC */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-/*
- * Configuration for a maximum 32MB of FLASH memory
- */
-#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* FLASH banks count (not chip count) */
-#define CONFIG_SYS_MAX_FLASH_SECT 256 /* number of sector in FLASH bank */
-#define CONFIG_SYS_FLASH_BASE 0x10000000 /* location of flash memory */
-
-/* This should be defined if CFI FLASH device is present. */
-#define CONFIG_SYS_FLASH_CFI 1
-#define CONFIG_FLASH_CFI_DRIVER 1
-#define CONFIG_FLASH_CFI_MTD
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */
-#define CONFIG_SYS_FLASH_PROTECTION 1
-#define CONFIG_SYS_DIRECT_FLASH_TFTP 1
-#define CONFIG_FLASH_SHOW_PROGRESS 45
-/*
- * This is setting for JFFS2 support in u-boot.
- * NOTE: Enable CONFIG_SYS_CMD_JFFS2 for JFFS2 support.
- */
-#define CONFIG_SYS_JFFS_CUSTOM_PART
-
-/*
- * 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 0x10000000
-#define CONFIG_SYS_MONITOR_LEN 0x00040000 /* 256kB ( 2 flash sector ) */
-#define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_ADDR 0x10040000 /* absolute address for now */
-#define CONFIG_ENV_SIZE 0x00020000
-#define CONFIG_ENV_SECT_SIZE 0x00020000
-#define CONFIG_ENV_OVERWRITE 1 /* env is writable now */
-#define CONFIG_FIRMWARE_ADDR 0x10060000
-#define CONFIG_FIRMWARE_LEN 0x00040000 /* 256kB ( 2 flash sector ) */
-#define CONFIG_KERNEL_ADDR 0x100A0000
-#define CONFIG_KERNEL_LEN 0x00200000 /* 2MB */
-#define CONFIG_ROOTFS_ADDR 0x102A0000
-#define CONFIG_ROOTFS_LEN /* entire flash if not specified */
-
-/*
- * Default load address for user programs and kernel
- */
-#define CONFIG_SYS_LOAD_ADDR 0x08000000
-#define CONFIG_LOADADDR 0x08000000
-#define CONFIG_SYS_TFTP_LOADADDR 0x08000000
-/*
- * Hardware drivers
- */
-
-/* DM9000 ethernet chipset assigned to CS4 */
-/* For the apf board DM9000 base is 0x15C00000 and data is base+2 */
-/* For the apm board DM9000 base is 0x15C3FFFC and data is base+4 */
-#define CONFIG_DRIVER_DM9000 1
-//#undef CONFIG_DM9000_DEBUG
-#define CONFIG_DM9000_BASE 0x15C00000
-#define DM9000_IO CONFIG_DM9000_BASE
-#define DM9000_DATA (CONFIG_DM9000_BASE+2)
-#define CONFIG_NET_MULTI
-
-/*-----------------------------------------------------------------------
- * FPGA stuff
- */
-#define CONFIG_FPGA_COUNT 1
-/* only digital value for CONFIG_FPGA is supported (investigation pending) */
-#define CONFIG_FPGA 0x801 /* CONFIG_SYS_XILINX_SPARTAN3 */
-#define CONFIG_FPGA_XILINX
-#define CONFIG_FPGA_SPARTAN3
-#define CONFIG_SYS_FPGA_WAIT 250
-#define CONFIG_SYS_FPGA_PROG_FEEDBACK
-#define CONFIG_SYS_FPGA_CHECK_CTRLC
-#define CONFIG_SYS_FPGA_CHECK_ERROR
-
-/* FPGA program pin configuration */
-#define CONFIG_SYS_FPGA_PRG (GPIO_PORTB | 18) /* FPGA prog pin (SSI output) */
-#define CONFIG_SYS_FPGA_CLK (GPIO_PORTB | 19) /* FPGA clk pin (SSI output) */
-#define CONFIG_SYS_FPGA_DATA (GPIO_PORTB | 17) /* FPGA data pin (SSI output) */
-#define CONFIG_SYS_FPGA_INIT (GPIO_PORTB | 15) /* FPGA init pin (SSI input) */
-#define CONFIG_SYS_FPGA_DONE (GPIO_PORTB | 16) /* FPGA done pin (SSI input) */
-
-/*
- * I2C bus
- */
-
-#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
-
-#define CONFIG_SYS_I2C_SPEED 400000 /* 400 kHz */
-#define CONFIG_SYS_I2C_SLAVE 0x7F
-
-# define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC256 */
-# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 /* bytes of address */
-/* mask of address bits that overflow into the "EEPROM chip address" */
-/*#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x00*/
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */
-
-#define CONFIG_RTC_DS1374
-/*#define CONFIG_MMC 1
-*/
-/*
- * External interfaces module
- *
- * CSxU_VAL:
- * 63| x |x|x x|x x x x|x x| x | x |x x x x|48
- * |DTACK_SEL|0|BCD| BCS |PSZ|PME|SYNC| DOL |
- *
- * 47| x x | x x x x x x | x | x x x x | x x x x |32
- * | CNC | WSC | 0 | WWS | EDC |
- *
- * CSxL_VAL:
- * 31| x x x x | x x x x | x x x x | x x x x |24
- * | OEA | OEN | WEA | WEN |
- * 23|x x x x| x | x x x | x x x x |x x| x | x | 0
- * | CSA |EBC| DSZ | 0|SP|0|WP|0 0|PA |CSEN |
- */
-
-/* CS0 configuration for flash memory Micron MT28F128J3-150 */
-#define CONFIG_SYS_CS0_CHIP_SELECT_ENABLE 1 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS0_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins */
- /* 3=8bits on D[7:0] 6=32 bits..*/
-#define CONFIG_SYS_CS0_SUPERVISOR_PROTECT 0 /* 1 : user mode access prohibited */
-#define CONFIG_SYS_CS0_WRITE_PROTECT 0 /* 1 : write access prohibited */
-#define CONFIG_SYS_CS0_EB_SIGNAL_CONTROL_WRITE 1 /* 1 when EB is used as write signal */
-#define CONFIG_SYS_CS0_READ_CYC_LGTH 150 /* ns */
-#define CONFIG_SYS_CS0_OE_ASSERT_DLY 0 /* ns */
-#define CONFIG_SYS_CS0_OE_NEG_DLY 0 /* ns */
-
-#define CONFIG_SYS_CS0_CS_NEG_LGTH 0 /* ns CS HIGH to CS LOW : tCWH */
-#define CONFIG_SYS_CS0_XTRA_DEAD_CYC 35 /* ns from CS HIGH to tristate bus */
-
-#define CONFIG_SYS_CS0_WRITE_XTRA_LGTH 0 /* ns */
-#define CONFIG_SYS_CS0_EB_ASSERT_DLY 0 /* ns */
-#define CONFIG_SYS_CS0_EB_NEG_DLY 0 /* ns */
-#define CONFIG_SYS_CS0_CS_ASSERT_NEG_DLY 0 /* ns */
-
-#define CONFIG_SYS_CS0_SYNC_ENABLE 1 /* enable synchronous burst mode */
-#define CONFIG_SYS_CS0_SYNC_PAGE_MODE_EMUL 1 /* enable page mode emulation */
-#define CONFIG_SYS_CS0_SYNC_PAGE_SIZE 0 /* 4 words page size (8bytes) */
-#define CONFIG_SYS_CS0_SYNC_BURST_CLK_START 0 /* 0 ns burst clock delay */
-#define CONFIG_SYS_CS0_SYNC_BURST_CLK_DIV 0 /* 0 : divider is 1 */
-#define CONFIG_SYS_CS0_SYNC_DAT_OUT_LGTH 25 /* ns */
-
-/* CS1 configuration for */
-#define CONFIG_SYS_CS1_CHIP_SELECT_ENABLE 1 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS1_PIN_ASSERT 0 /* chip select pin state when */
- /* chip select disabled */
-#define CONFIG_SYS_CS1_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins*/
- /* 3=8bits on D[7:0] 6=32 bits..*/
-#define CONFIG_SYS_CS1_SUPERVISOR_PROTECT 0 /* 1 : user mode access prohibited */
-#define CONFIG_SYS_CS1_WRITE_PROTECT 0 /* 1 : write access prohibited */
-#define CONFIG_SYS_CS1_EB_SIGNAL_CONTROL_WRITE 1 /* 1 when EB is used as write signal */
-
-#define CONFIG_SYS_CS1_READ_CYC_LGTH 50 /* ns */
-#define CONFIG_SYS_CS1_OE_ASSERT_DLY 0 /* ns */
-#define CONFIG_SYS_CS1_OE_NEG_DLY 0 /* ns */
-
-#define CONFIG_SYS_CS1_CS_NEG_LGTH 0 /* max 30 ns CS HIGH to CS LOW at 100MHz */
-#define CONFIG_SYS_CS1_XTRA_DEAD_CYC 0 /* ns from CS HIGH to tristate bus */
-
-#define CONFIG_SYS_CS1_WRITE_XTRA_LGTH 0 /* ns */
-#define CONFIG_SYS_CS1_EB_ASSERT_DLY 0 /* ns */
-#define CONFIG_SYS_CS1_EB_NEG_DLY 0 /* ns */
-#define CONFIG_SYS_CS1_CS_ASSERT_NEG_DLY 0 /* ns */
-
-#define CONFIG_SYS_CS1_SYNC_ENABLE 0 /* enable synchronous burst mode */
-#define CONFIG_SYS_CS1_SYNC_PAGE_MODE_EMUL 0 /* enable page mode emulation */
-#define CONFIG_SYS_CS1_SYNC_PAGE_SIZE 0 /* 4 words page size (8bytes) */
-#define CONFIG_SYS_CS1_SYNC_BURST_CLK_START 0 /* 0 ns burst clock delay */
-#define CONFIG_SYS_CS1_SYNC_BURST_CLK_DIV 0 /* 0 : divider is 1 */
-#define CONFIG_SYS_CS1_SYNC_DAT_OUT_LGTH 0 /* ns */
-
-/* CS2 configuration for */
-#define CONFIG_SYS_CS2_CHIP_SELECT_ENABLE 0 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS2_PIN_ASSERT 0 /* chip select pin state when */
- /*chip select disabled */
-#define CONFIG_SYS_CS2_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins */
- /* 3=8bits on D[7:0] 6=32 bits..*/
-#define CONFIG_SYS_CS2_SUPERVISOR_PROTECT 0 /* 1 : user mode access prohibited */
-#define CONFIG_SYS_CS2_WRITE_PROTECT 0 /* 1 : write access prohibited */
-#define CONFIG_SYS_CS2_EB_SIGNAL_CONTROL_WRITE 1 /* 1 when EB is used as write signal */
-
-#define CONFIG_SYS_CS2_READ_CYC_LGTH 0 /* ns */
-#define CONFIG_SYS_CS2_OE_ASSERT_DLY 0 /* ns */
-#define CONFIG_SYS_CS2_OE_NEG_DLY 0 /* ns */
-
-#define CONFIG_SYS_CS2_CS_NEG_LGTH 0 /* max 30 ns CS HIGH to CS LOW at 100MHz */
-#define CONFIG_SYS_CS2_XTRA_DEAD_CYC 0 /* ns from CS HIGH to tristate bus */
-
-#define CONFIG_SYS_CS2_WRITE_XTRA_LGTH 0 /* ns */
-#define CONFIG_SYS_CS2_EB_ASSERT_DLY 0 /* ns */
-#define CONFIG_SYS_CS2_EB_NEG_DLY 0 /* ns */
-#define CONFIG_SYS_CS2_CS_ASSERT_NEG_DLY 0 /* ns */
-
-#define CONFIG_SYS_CS2_SYNC_ENABLE 0 /* enable synchronous burst mode */
-#define CONFIG_SYS_CS2_SYNC_PAGE_MODE_EMUL 0 /* enable page mode emulation*/
-#define CONFIG_SYS_CS2_SYNC_PAGE_SIZE 0 /* 4 words page size (8bytes) */
-#define CONFIG_SYS_CS2_SYNC_BURST_CLK_START 0 /* 0 ns burst clock delay */
-#define CONFIG_SYS_CS2_SYNC_BURST_CLK_DIV 0 /* 0 : divider is 1 */
-#define CONFIG_SYS_CS2_SYNC_DAT_OUT_LGTH 0 /* ns */
-
-/* CS3 configuration for ISP1760 */
-#define CONFIG_SYS_CS3_CHIP_SELECT_ENABLE 1 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS3_PIN_ASSERT 0 /* chip select pin state when */
- /* chip select disabled */
-#define CONFIG_SYS_CS3_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins */
- /* 3=8bits on D[7:0] 6=32 bits..*/
-#define CONFIG_SYS_CS3_SUPERVISOR_PROTECT 0 /* 1: user mode access prohibited*/
-#define CONFIG_SYS_CS3_WRITE_PROTECT 0 /* 1: write access prohibited */
-#define CONFIG_SYS_CS3_EB_SIGNAL_CONTROL_WRITE 1 /* 1 when EB is used as write signal*/
-
-#define CONFIG_SYS_CS3_READ_CYC_LGTH 110 /* ns */
-#define CONFIG_SYS_CS3_OE_ASSERT_DLY 45 /* ns */
-#define CONFIG_SYS_CS3_OE_NEG_DLY 40 /* ns */
-
-#define CONFIG_SYS_CS3_CS_NEG_LGTH 30 /* max 30 ns CS HIGH to CS LOW at 100MHz */
-#define CONFIG_SYS_CS3_XTRA_DEAD_CYC 0 /* ns from CS HIGH to tristate bus */
-
-#define CONFIG_SYS_CS3_WRITE_XTRA_LGTH 0 /* ns */
-#define CONFIG_SYS_CS3_EB_ASSERT_DLY 45 /* ns */
-#define CONFIG_SYS_CS3_EB_NEG_DLY 45 /* ns */
-#define CONFIG_SYS_CS3_CS_ASSERT_NEG_DLY 35 /* ns */
-
-#define CONFIG_SYS_CS3_SYNC_ENABLE 0 /* enable synchronous burst mode*/
-#define CONFIG_SYS_CS3_SYNC_PAGE_MODE_EMUL 0 /* enable page mode emulation*/
-#define CONFIG_SYS_CS3_SYNC_PAGE_SIZE 0 /* 4 words page size (8bytes) */
-#define CONFIG_SYS_CS3_SYNC_BURST_CLK_START 0 /* 0 ns burst clock delay */
-#define CONFIG_SYS_CS3_SYNC_BURST_CLK_DIV 0 /* 0 : divider is 1 */
-#define CONFIG_SYS_CS3_SYNC_DAT_OUT_LGTH 0 /* ns */
-
-/* CS4 configuration for DM9000 ethernet chipset */
-#define CONFIG_SYS_CS4_CHIP_SELECT_ENABLE 1 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS4_PIN_ASSERT 0 /* chip select pin state when */
- /* chip select disabled */
-#define CONFIG_SYS_CS4_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins */
- /* 3=8bits on D[7:0] 6=32 bits..*/
-#define CONFIG_SYS_CS4_SUPERVISOR_PROTECT 0 /* 1 : user mode access prohibited*/
-#define CONFIG_SYS_CS4_WRITE_PROTECT 0 /* 1 : write access prohibited */
-#define CONFIG_SYS_CS4_EB_SIGNAL_CONTROL_WRITE 1 /* 1 when EB is used as write signal*/
-
-#define CONFIG_SYS_CS4_READ_CYC_LGTH 72 /* ns */
-#define CONFIG_SYS_CS4_OE_ASSERT_DLY 5 /* ns */
-#define CONFIG_SYS_CS4_OE_NEG_DLY 45 /* ns */
-
-#define CONFIG_SYS_CS4_CS_NEG_LGTH 30 /* max 30 ns CS HIGH to CS LOW at 100MHz*/
-#define CONFIG_SYS_CS4_XTRA_DEAD_CYC 0 /* ns from CS HIGH to tristate bus */
-
-#define CONFIG_SYS_CS4_WRITE_XTRA_LGTH 0 /* ns */
-#define CONFIG_SYS_CS4_EB_ASSERT_DLY 5 /* ns */
-#define CONFIG_SYS_CS4_EB_NEG_DLY 45 /* ns */
-#define CONFIG_SYS_CS4_CS_ASSERT_NEG_DLY 0 /* ns */
-
-#define CONFIG_SYS_CS4_SYNC_ENABLE 0 /* enable synchronous burst mode*/
-#define CONFIG_SYS_CS4_SYNC_PAGE_MODE_EMUL 0 /* enable page mode emulation */
-#define CONFIG_SYS_CS4_SYNC_PAGE_SIZE 0 /* 4 words page size (8bytes) */
-#define CONFIG_SYS_CS4_SYNC_BURST_CLK_START 0 /* 0 ns burst clock delay */
-#define CONFIG_SYS_CS4_SYNC_BURST_CLK_DIV 0 /* 0 : divider is 1 */
-#define CONFIG_SYS_CS4_SYNC_DAT_OUT_LGTH 0 /* ns */
-
-/* CS5 configuration for */
-#define CONFIG_SYS_CS5_CHIP_SELECT_ENABLE 1 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS5_PIN_ASSERT 0 /* chip select pin state when */
- /* chip select disabled */
-#define CONFIG_SYS_CS5_DATA_PORT_SIZE 0x5 /* 5=16 bits on D[15:0] pins */
- /* 3=8bits on D[7:0] 6=32 bits..*/
-#define CONFIG_SYS_CS5_SUPERVISOR_PROTECT 0 /* 1: user mode access prohibited*/
-#define CONFIG_SYS_CS5_WRITE_PROTECT 0 /* 1 : write access prohibited*/
-#define CONFIG_SYS_CS5_EB_SIGNAL_CONTROL_WRITE 1 /* 1 when EB is used as write signal*/
-#define CONFIG_SYS_CS5_DTACK_SELECT 1 /* Activate DTACK fonction */
- /* (asynchrone bus) */
-
-#define CONFIG_SYS_CS5_READ_CYC_LGTH -1 /* ns or -1 to DTACK function */
-#define CONFIG_SYS_CS5_OE_ASSERT_DLY 10 /* ns */
-#define CONFIG_SYS_CS5_OE_NEG_DLY 10 /* ns */
-
-#define CONFIG_SYS_CS5_CS_NEG_LGTH 10 /* max 30 ns CS HIGH to CS LOW at 100MHz*/
-#define CONFIG_SYS_CS5_XTRA_DEAD_CYC 0 /* ns from CS HIGH to tristate bus */
-
-#define CONFIG_SYS_CS5_WRITE_XTRA_LGTH 0 /* ns */
-#define CONFIG_SYS_CS5_EB_ASSERT_DLY 10 /* ns */
-#define CONFIG_SYS_CS5_EB_NEG_DLY 10 /* ns */
-#define CONFIG_SYS_CS5_CS_ASSERT_NEG_DLY 0 /* ns */
-
-#define CONFIG_SYS_CS5_SYNC_ENABLE 0 /* enable synchron burst mode */
-#define CONFIG_SYS_CS5_SYNC_PAGE_MODE_EMUL 0 /* enable page mode emulation */
-#define CONFIG_SYS_CS5_SYNC_PAGE_SIZE 0 /* 4 words page size (8bytes) */
-#define CONFIG_SYS_CS5_SYNC_BURST_CLK_START 0 /* 0 ns burst clock delay */
-#define CONFIG_SYS_CS5_SYNC_BURST_CLK_DIV 0 /* 0 : divider is 1 */
-#define CONFIG_SYS_CS5_SYNC_DAT_OUT_LGTH 0 /* ns */
-
-/*
- * Default configuration for GPIOs and peripherals
- */
-#define CONFIG_SYS_DDIR_A_VAL 0x00000000
-#define CONFIG_SYS_OCR1_A_VAL 0x00000000
-#define CONFIG_SYS_OCR2_A_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_A_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFA2_A_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_A_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB2_A_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_A_VAL 0x00000000
-
-/* Setup for PA23 which is Reset Default PA23 but has to become
- CS5 */
-#define CONFIG_SYS_GIUS_A_VAL 0x00007FF8
-#define CONFIG_SYS_ICR1_A_VAL 0x00000000
-#define CONFIG_SYS_ICR2_A_VAL 0x00000000
-#define CONFIG_SYS_IMR_A_VAL 0x00000000
-#define CONFIG_SYS_GPR_A_VAL 0x00000000
-#define CONFIG_SYS_PUEN_A_VAL 0xFFFFFFFF
-
-#define CONFIG_SYS_DDIR_B_VAL 0x00000000
-#define CONFIG_SYS_OCR1_B_VAL 0x00000000
-#define CONFIG_SYS_OCR2_B_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFA2_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB2_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_B_VAL 0x00000000
-#define CONFIG_SYS_GIUS_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICR1_B_VAL 0x00000000
-#define CONFIG_SYS_ICR2_B_VAL 0x00000000
-#define CONFIG_SYS_IMR_B_VAL 0x00000000
-#define CONFIG_SYS_GPR_B_VAL 0x00000000
-#define CONFIG_SYS_PUEN_B_VAL 0xFFFFFFFF
-
-#define CONFIG_SYS_DDIR_C_VAL 0x00000000
-#define CONFIG_SYS_OCR1_C_VAL 0x00000000
-#define CONFIG_SYS_OCR2_C_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_C_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFA2_C_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_C_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB2_C_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_C_VAL 0x00000000
-#define CONFIG_SYS_GIUS_C_VAL 0x0007FFFF
-#define CONFIG_SYS_ICR1_C_VAL 0x00000000
-#define CONFIG_SYS_ICR2_C_VAL 0x00000000
-#define CONFIG_SYS_IMR_C_VAL 0x00000000
-#define CONFIG_SYS_GPR_C_VAL 0x00000000
-#define CONFIG_SYS_PUEN_C_VAL 0xF913FFFF
-
-#define CONFIG_SYS_DDIR_D_VAL 0x00000000
-#define CONFIG_SYS_OCR1_D_VAL 0x00000000
-#define CONFIG_SYS_OCR2_D_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_D_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFA2_D_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_D_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB2_D_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_D_VAL 0x00000000
-#define CONFIG_SYS_GIUS_D_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICR1_D_VAL 0x00000000
-#define CONFIG_SYS_ICR2_D_VAL 0x00000000
-#define CONFIG_SYS_IMR_D_VAL 0x00000000
-#define CONFIG_SYS_GPR_D_VAL 0x00000000
-#define CONFIG_SYS_PUEN_D_VAL 0xFFFFFFFF
-
-#define CONFIG_SYS_GPCR_VAL 0x000003AB
-
-/* FMCR Bit 1 becomes 0 to make CS3 if we have only one sdram bank*/
-#if (CONFIG_NR_DRAM_BANKS == 1)
-#define CONFIG_SYS_FMCR_VAL 0x00000001
-#elif (CONFIG_NR_DRAM_BANKS == 2)
-#define CONFIG_SYS_FMCR_VAL 0x00000003
-#endif
-
-/*
- * FIXME: From here, there should not be any user configuration.
- * All Equations are automatic
- */
-
-
-#define CONFIG_SYS_HCLK_LGTH (1000/CONFIG_SYS_BUS_FREQ) /* ns */
-
-/* USB 48 MHz ; BUS 96MHz*/
-#ifdef CONFIG_SYS_OSC16
-#define CSCR_MASK 0x23030003
-#else
-#define CSCR_MASK 0x23000003
-#endif
-#define CONFIG_SYS_CSCR_VAL\
- (CSCR_MASK \
- |((((CONFIG_SYS_FREQ/CONFIG_USB_FREQ)-1)&0x07)<<26) \
- |((((CONFIG_SYS_FREQ/CONFIG_SYS_BUS_FREQ)-1)&0x0F)<<10))
-
-/* PERCLKx 16MHz */
-#define CONFIG_SYS_PCDR_VAL\
- (((((CONFIG_SYS_FREQ/CONFIG_PERIF1_FREQ)-1)&0x0F)<<0) \
- |((((CONFIG_SYS_FREQ/CONFIG_PERIF2_FREQ)-1)&0x0F)<<4) \
- |((((CONFIG_SYS_FREQ/CONFIG_PERIF3_FREQ)-1)&0x7F)<<16))
-
-/* SDRAM controller programming Values */
-#if ((CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1>(3*CONFIG_SYS_HCLK_LGTH))\
- ||(CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1<1))
-#define REG_FIELD_SCL_VAL 3
-#else
-#define REG_FIELD_SCL_VAL\
- ((CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)
-#endif
-
-#if ((CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY>(2*CONFIG_SYS_HCLK_LGTH))\
- ||(CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY<1))
-#define REG_FIELD_SRP_VAL 0
-#else
-#define REG_FIELD_SRP_VAL 1
-#endif
-
-#if (CONFIG_SYS_SDRAM_ROW_2_COL_DELAY>(3*CONFIG_SYS_HCLK_LGTH))
-#define REG_FIELD_SRCD_VAL 0
-#else
-#define REG_FIELD_SRCD_VAL\
- ((CONFIG_SYS_SDRAM_ROW_2_COL_DELAY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)
-#endif
-
-#if (CONFIG_SYS_SDRAM_ROW_CYCLE_DELAY>(7*CONFIG_SYS_HCLK_LGTH))
-#define REG_FIELD_SRC_VAL 0
-#else
-#define REG_FIELD_SRC_VAL\
- ((CONFIG_SYS_SDRAM_ROW_CYCLE_DELAY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)
-#endif
-
-#define REG_SDCTL_BASE_CONFIG (0x800a1000\
- | (((CONFIG_SYS_SDRAM_NUM_ROW-11)&0x3)<<24)\
- | (((CONFIG_SYS_SDRAM_NUM_COL-8)&0x3)<<20)\
- | (((CONFIG_SYS_SDRAM_REFRESH)&0x3)<<14)\
- | (((REG_FIELD_SCL_VAL)&0x3)<<8)\
- | (((REG_FIELD_SRP_VAL)&0x1)<<6)\
- | (((REG_FIELD_SRCD_VAL)&0x3)<<4)\
- | (((REG_FIELD_SRC_VAL)&0x7)<<0))
-
-#define CONFIG_SYS_NORMAL_RW_CMD ((0x0<<28)+REG_SDCTL_BASE_CONFIG)
-#define CONFIG_SYS_PRECHARGE_CMD ((0x1<<28)+REG_SDCTL_BASE_CONFIG)
-#define CONFIG_SYS_AUTOREFRESH_CMD ((0x2<<28)+REG_SDCTL_BASE_CONFIG)
-#define CONFIG_SYS_SET_MODE_REG_CMD ((0x3<<28)+REG_SDCTL_BASE_CONFIG)
-
-/* Issue Mode register Command to SDRAM*/
-#define CONFIG_SYS_SDRAM_MODE_REGISTER_VAL\
- ((((CONFIG_SYS_SDRAM_BURST_LENGTH)&0x7)<<(CONFIG_SYS_SDRAM_NUM_COL+4))\
- | (((REG_FIELD_SCL_VAL)&0x3)<<(CONFIG_SYS_SDRAM_NUM_COL+4+4))\
- | (((CONFIG_SYS_SDRAM_SINGLE_ACCESS)&0x1)<<(CONFIG_SYS_SDRAM_NUM_COL+4+9)))
-
-/* Issue Precharge all Command to SDRAM*/
-#define CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL\
- (((CONFIG_SYS_SDRAM_SINGLE_ACCESS)&0x1)<<(CONFIG_SYS_SDRAM_NUM_COL+4+9))
-
-/* undef CONFIG_INIT_CRITICAL is no more required to boot from sdram */
-#undef CONFIG_INIT_CRITICAL
-
-/*
- * CSxU_VAL:
- * 63| x |x|x x|x x x x|x x| x | x |x x x x|48
- * |DTACK_SEL|0|BCD| BCS |PSZ|PME|SYNC| DOL |
- *
- * 47| x x | x x x x x x | x | x x x x | x x x x |32
- * | CNC | WSC | 0 | WWS | EDC |
- *
- * CSxL_VAL:
- * 31| x x x x | x x x x | x x x x | x x x x |24
- * | OEA | OEN | WEA | WEN |
- * 23|x x x x| x | x x x | x x x x |x x| x | x | 0
- * | CSA |EBC| DSZ | 0|SP|0|WP|0 0|PA |CSEN |
- */
-#define CONFIG_SYS_CS0U_VAL\
- ((((CONFIG_SYS_CS0_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
- |((((CONFIG_SYS_CS0_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
- |(((((CONFIG_SYS_CS0_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
- |((((CONFIG_SYS_CS0_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
- |((((CONFIG_SYS_CS0_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |((CONFIG_SYS_CS0_SYNC_ENABLE&0x01)<<20)\
- |((CONFIG_SYS_CS0_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
- |((CONFIG_SYS_CS0_SYNC_PAGE_SIZE&0x03)<<22)\
- |((((CONFIG_SYS_CS0_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |((CONFIG_SYS_CS0_SYNC_BURST_CLK_DIV&0x03)<<28))
-
-#define CONFIG_SYS_CS0L_VAL\
- ((CONFIG_SYS_CS0_CHIP_SELECT_ENABLE&0x01)\
- |((CONFIG_SYS_CS0_WRITE_PROTECT&0x01)<<4)\
- |((CONFIG_SYS_CS0_SUPERVISOR_PROTECT&0x01)<<6)\
- |((CONFIG_SYS_CS0_DATA_PORT_SIZE&0x07)<<8)\
- |((CONFIG_SYS_CS0_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
- |((((CONFIG_SYS_CS0_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
- |(((((CONFIG_SYS_CS0_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |(((((CONFIG_SYS_CS0_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
- |(((((CONFIG_SYS_CS0_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |(((((CONFIG_SYS_CS0_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
-
-#define CONFIG_SYS_CS1U_VAL\
- ((((CONFIG_SYS_CS1_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
- |((((CONFIG_SYS_CS1_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
- |(((((CONFIG_SYS_CS1_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
- |((((CONFIG_SYS_CS1_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
- |((((CONFIG_SYS_CS1_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |((CONFIG_SYS_CS1_SYNC_ENABLE&0x01)<<20)\
- |((CONFIG_SYS_CS1_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
- |((CONFIG_SYS_CS1_SYNC_PAGE_SIZE&0x03)<<22)\
- |((((CONFIG_SYS_CS1_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |((CONFIG_SYS_CS1_SYNC_BURST_CLK_DIV&0x03)<<28))
-
-#define CONFIG_SYS_CS1L_VAL\
- ((CONFIG_SYS_CS1_CHIP_SELECT_ENABLE&0x01)\
- |((CONFIG_SYS_CS1_PIN_ASSERT&0x01)<<1)\
- |((CONFIG_SYS_CS1_WRITE_PROTECT&0x01)<<4)\
- |((CONFIG_SYS_CS1_SUPERVISOR_PROTECT&0x01)<<6)\
- |((CONFIG_SYS_CS1_DATA_PORT_SIZE&0x07)<<8)\
- |((CONFIG_SYS_CS1_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
- |((((CONFIG_SYS_CS1_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
- |(((((CONFIG_SYS_CS1_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |(((((CONFIG_SYS_CS1_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
- |(((((CONFIG_SYS_CS1_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |(((((CONFIG_SYS_CS1_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
-
-#define CONFIG_SYS_CS2U_VAL\
- (((((CONFIG_SYS_CS2_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
- |((((CONFIG_SYS_CS2_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
- |(((((CONFIG_SYS_CS2_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
- |((((CONFIG_SYS_CS2_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
- |(((CONFIG_SYS_CS2_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |((CONFIG_SYS_CS2_SYNC_ENABLE&0x01)<<20)\
- |((CONFIG_SYS_CS2_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
- |((CONFIG_SYS_CS2_SYNC_PAGE_SIZE&0x03)<<22)\
- |((((CONFIG_SYS_CS2_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |((CONFIG_SYS_CS2_SYNC_BURST_CLK_DIV&0x03)<<28))
-
-#define CONFIG_SYS_CS2L_VAL\
- ((CONFIG_SYS_CS2_CHIP_SELECT_ENABLE&0x01)\
- |((CONFIG_SYS_CS2_PIN_ASSERT&0x01)<<1)\
- |((CONFIG_SYS_CS2_WRITE_PROTECT&0x01)<<4)\
- |((CONFIG_SYS_CS2_SUPERVISOR_PROTECT&0x01)<<6)\
- |((CONFIG_SYS_CS2_DATA_PORT_SIZE&0x07)<<8)\
- |((CONFIG_SYS_CS2_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
- |((((CONFIG_SYS_CS2_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
- |(((((CONFIG_SYS_CS2_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |(((((CONFIG_SYS_CS2_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
- |(((((CONFIG_SYS_CS2_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |(((((CONFIG_SYS_CS2_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
-
-#define CONFIG_SYS_CS3U_VAL\
- ((((CONFIG_SYS_CS3_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
- |((((CONFIG_SYS_CS3_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
- |(((((CONFIG_SYS_CS3_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
- |((((CONFIG_SYS_CS3_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
- |((((CONFIG_SYS_CS3_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |((CONFIG_SYS_CS3_SYNC_ENABLE&0x01)<<20)\
- |((CONFIG_SYS_CS3_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
- |((CONFIG_SYS_CS3_SYNC_PAGE_SIZE&0x03)<<22)\
- |((((CONFIG_SYS_CS3_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |((CONFIG_SYS_CS3_SYNC_BURST_CLK_DIV&0x03)<<28))
-
-#define CONFIG_SYS_CS3L_VAL\
- ((CONFIG_SYS_CS3_CHIP_SELECT_ENABLE&0x01)\
- |((CONFIG_SYS_CS3_PIN_ASSERT&0x01)<<1)\
- |((CONFIG_SYS_CS3_WRITE_PROTECT&0x01)<<4)\
- |((CONFIG_SYS_CS3_SUPERVISOR_PROTECT&0x01)<<6)\
- |((CONFIG_SYS_CS3_DATA_PORT_SIZE&0x07)<<8)\
- |((CONFIG_SYS_CS3_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
- |((((CONFIG_SYS_CS3_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
- |(((((CONFIG_SYS_CS3_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |(((((CONFIG_SYS_CS3_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
- |(((((CONFIG_SYS_CS3_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |(((((CONFIG_SYS_CS3_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
-
-#define CONFIG_SYS_CS4U_VAL\
- (((((CONFIG_SYS_CS4_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
- |((((CONFIG_SYS_CS4_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
- |(((((CONFIG_SYS_CS4_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
- |((((CONFIG_SYS_CS4_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
- |((((CONFIG_SYS_CS4_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16))\
- |((CONFIG_SYS_CS4_SYNC_ENABLE&0x01)<<20)\
- |((CONFIG_SYS_CS4_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
- |((CONFIG_SYS_CS4_SYNC_PAGE_SIZE&0x03)<<22)\
- |((((CONFIG_SYS_CS4_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |((CONFIG_SYS_CS4_SYNC_BURST_CLK_DIV&0x03)<<28))
-
-#define CONFIG_SYS_CS4L_VAL\
- ((CONFIG_SYS_CS4_CHIP_SELECT_ENABLE&0x01)\
- |((CONFIG_SYS_CS4_PIN_ASSERT&0x01)<<1)\
- |((CONFIG_SYS_CS4_WRITE_PROTECT&0x01)<<4)\
- |((CONFIG_SYS_CS4_SUPERVISOR_PROTECT&0x01)<<6)\
- |((CONFIG_SYS_CS4_DATA_PORT_SIZE&0x07)<<8)\
- |((CONFIG_SYS_CS4_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
- |((((CONFIG_SYS_CS4_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
- |(((((CONFIG_SYS_CS4_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |(((((CONFIG_SYS_CS4_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
- |(((((CONFIG_SYS_CS4_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |(((((CONFIG_SYS_CS4_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
-
-#define CONFIG_SYS_CS5U_VAL\
- ((((CONFIG_SYS_CS5_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
- |((((CONFIG_SYS_CS5_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
- |(((((CONFIG_SYS_CS5_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
- |((((CONFIG_SYS_CS5_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
- |((((CONFIG_SYS_CS5_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |((CONFIG_SYS_CS5_SYNC_ENABLE&0x01)<<20)\
- |((CONFIG_SYS_CS5_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
- |((CONFIG_SYS_CS5_SYNC_PAGE_SIZE&0x03)<<22)\
- |((((CONFIG_SYS_CS5_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |((CONFIG_SYS_CS5_SYNC_BURST_CLK_DIV&0x03)<<28)\
- |((CONFIG_SYS_CS5_DTACK_SELECT&0x01)<<31))
-
-#define CONFIG_SYS_CS5L_VAL\
- ((CONFIG_SYS_CS5_CHIP_SELECT_ENABLE&0x01)\
- |((CONFIG_SYS_CS5_PIN_ASSERT&0x01)<<1)\
- |((CONFIG_SYS_CS5_WRITE_PROTECT&0x01)<<4)\
- |((CONFIG_SYS_CS5_SUPERVISOR_PROTECT&0x01)<<6)\
- |((CONFIG_SYS_CS5_DATA_PORT_SIZE&0x07)<<8)\
- |((CONFIG_SYS_CS5_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
- |((((CONFIG_SYS_CS5_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
- |(((((CONFIG_SYS_CS5_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
- |(((((CONFIG_SYS_CS5_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
- |(((((CONFIG_SYS_CS5_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
- |(((((CONFIG_SYS_CS5_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
-
-#endif /* __CONFIG_H */
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
deleted file mode 100644
index b609887..0000000
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
+++ /dev/null
@@ -1,1034 +0,0 @@
-/*
- * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
- *
- * Configuration settings for the Armadeus Project motherboard 9328.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- *
- * 2005/01/14 Initial version taken from the scb9328 configuration file
- * 2005/03/10 apf9328 configuration file and trial to improve of
- * hardware register control.
- * 2005/08/16 added APF9328 fpgas and ethernet
- * 2005/12/02 added filesystem boot over NFS
- * 2006/11/26 added filesystem boot over NFS
- * 2010/03/28 U-Boot 2010.03 migration + change timer unit to ms (fixme)
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "4.0"
-#define CONFIG_IDENT_STRING " apf9328 patch 4.0"
-
-#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
-#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
-#define CONFIG_apf9328 1 /* on a Armadeus project board */
-#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
-#define CONFIG_SYS_DCACHE_OFF /* fix kernel 2.6.29 boot crash */
-/*
- * Enable the call to misc_init_r() for miscellaneous platform
- * dependent initialization.
- */
-
-#define CONFIG_MISC_INIT_R
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_DNS2
-
-/*
- * Select serial console configuration
- */
-#define CONFIG_IMX_SERIAL
-#define CONFIG_IMX_SERIAL1
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_BAUDRATE 115200
-
-/*
- * 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.
- */
-
-#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_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_FLASH /* flinfo, erase, protect */
-#define CONFIG_CMD_I2C /* I2C serial bus support */
-#define CONFIG_CMD_IMLS /* List all found images */
-#define CONFIG_CMD_IMMAP /* IMMR dump support */
-#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
-#define CONFIG_CMD_MTDPARTS /* MTD partition support */
-#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_NFS
-#define CONFIG_CMD_DNS
-
-#undef CONFIG_DISPLAY_BOARDINFO
-#undef CONFIG_DISPLAY_CPUINFO
-
-/*
- * Select some advanced features of the commande line parser
- */
-#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_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
-#define CONFIG_CMDLINE_EDITING 1
-
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-/*
- * Boot options. Setting delay to -1 stops autostart count down.
- */
-#define CONFIG_BOOTDELAY 20
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
-#define CONFIG_BOOTARGS \
- CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
-
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)"n8"
-#define CONFIG_MTDMAP "physmap-flash.0"
-#define MTDIDS_DEFAULT "nor0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":256k(U-boot)ro," \
- "128k(U-boot_env),256k(firmware),2048k(kernel),-(rootfs)"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "env_version=" CONFIG_ENV_VERSION "\0" \
- "fileaddr=" MK_STR(CONFIG_SYS_LOAD_ADDR) "\0" \
- "filesize=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
- "console=" CONFIG_CONSOLE "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
- "partition= nor0,4\0" \
- "uboot_addr=" MK_STR(CONFIG_SYS_MONITOR_BASE) "\0" \
- "uboot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
- "env_addr=" MK_STR(CONFIG_ENV_ADDR) "\0" \
- "env_len=" MK_STR(CONFIG_ENV_SIZE) "\0" \
- "firmware_addr=" MK_STR(CONFIG_FIRMWARE_ADDR) "\0" \
- "firmware_len=" MK_STR(CONFIG_FIRMWARE_LEN) "\0" \
- "kernel_addr=" MK_STR(CONFIG_KERNEL_ADDR) "\0" \
- "kernel_len=" MK_STR(CONFIG_KERNEL_LEN) "\0" \
- "rootfs_addr=" MK_STR(CONFIG_ROOTFS_ADDR) "\0" \
- "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
- "serverpath=" MK_STR(CONFIG_SRV_PATH) "\0" \
- "ntpserverip=217.147.208.1\0" \
- "mmcroot=/dev/mmcblk0p1\0" \
- "mmcrootfstype=ext2\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} " \
- "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
- "addipargs=setenv bootargs ${bootargs} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
- "${hostname}::off \0" \
- "nfsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addnfsargs addipargs; bootm ${kernel_addr}\0" \
- "jffsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addjffsargs addipargs; bootm ${kernel_addr}\0" \
- "ubifsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addubifsargs addipargs; bootm ${kernel_addr}\0" \
- "mmcboot=setenv bootargs ${console} ${mtdparts};" \
- "run addmmcargs addipargs; bootm ${kernel_addr}\0" \
- "firmware_autoload=0\0" \
- "flash_uboot=protect off ${uboot_addr} +${uboot_len};" \
- "echo Erasing FLASH;" \
- "era ${uboot_addr} +${uboot_len};" \
- "if cp.b ${fileaddr} ${uboot_addr} ${filesize};" \
- "then protect on ${uboot_addr} +${uboot_len};" \
- "echo Flashing of uboot succeed;" \
- "else echo Flashing of uboot failed;" \
- "fi; \0" \
- "flash_firmware=echo Erasing FLASH;" \
- "era ${firmware_addr} +${firmware_len};" \
- "if cp.b ${fileaddr} ${firmware_addr} ${filesize} ;" \
- "then echo Flashing of Firmware succeed;" \
- "else echo Flashing of Firmware failed;" \
- "fi\0" \
- "flash_kernel=echo Erasing FLASH;" \
- "era ${kernel_addr} +${kernel_len};" \
- "if cp.b ${fileaddr} ${kernel_addr} ${filesize} ;" \
- "then echo Flashing of kernel succeed;" \
- "else echo Flashing of kernel failed;" \
- "fi\0" \
- "flash_rootfs=echo Erasing FLASH;" \
- "era nor0,4;" \
- "if cp.b ${fileaddr} ${rootfs_addr} ${filesize};" \
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
- "fi\0" \
- "flash_reset_env=protect off ${env_addr} +${env_len};" \
- "era ${env_addr} +${env_len};" \
- "echo Erasing of flash environment variables done!\0" \
- "download_uboot=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-u-boot.bin\0" \
- "download_kernel=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-linux.bin\0" \
- "download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.jffs2\0" \
- "update_uboot=run download_uboot flash_uboot\0" \
- "update_kernel=run download_kernel flash_kernel\0" \
- "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 00200008 0; mw 00210008 0\0" \
-
-#define CONFIG_BOOTCOMMAND "run jffsboot"
-#define CONFIG_SYS_AUTOLOAD "no"
-
-#define CONFIG_MACH_TYPE MACH_TYPE_APF9328
-#define CONFIG_BOOT_PARAMS_ADDR 0x08000100
-
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
-#define CONFIG_ETHADDR
-#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_IPADDR 192.168.000.10
-#define CONFIG_BOARD_NAME "apf9328"
-#define CONFIG_HOSTNAME "apf9328"
-#define CONFIG_GATEWAYIP 192.168.000.1
-#define CONFIG_SERVERIP 192.168.000.2
-#define CONFIG_SRV_PATH ""
-#define CONFIG_ROOTPATH "/tftpboot/apf9328-root"
-
-/*
- * General options for u-boot. Modify to save memory foot print
- */
-
-#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)
-#define CONFIG_SYS_MAXARGS 16 /* max command args */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* bootargs buf size*/
-
-#define CONFIG_SYS_MEMTEST_START 0x08000000 /* memtest test area */
-#define CONFIG_SYS_MEMTEST_END 0x08700000
-
-#define CONFIG_SYS_HZ 1000000l /* incrementer freq */
-
-/*
- * Definitions related to passing arguments to kernel.
- */
-
-#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 */
-
-/*
- * Malloc pool need to host env + 128 Kb reserve for other allocations.
- */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10))
-
-#define CONFIG_STACKSIZE (120<<10) /* stack size */
-
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ (4<<10) /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ (4<<10) /* FIQ stack */
-#endif
-
-/*
-* Clocks configuration
-*/
-/*
- * PLL configuration
- *
- * f_{dpll}=2*f{ref}*(MFI+MFN/(MFD+1))/(PD+1)
- * f_ref=16,777216MHz
- * 32768 Hz xtal
- * 0x07B32DA5: 192.0000173
- * 0x002a141f: 191,9944MHz
- * 0x040b2007: 144MHz
- * 0x0FB32DA5: 96.00000864 MHz
- * 0x042a141f: 96MHz
- * 0x0811140d: 64MHz
- * 0x040e200e: 150MHz
- * 0x00321431: 200MHz
- *
- *16 MHz xtal
- * 0x08001800: 64MHz mit 16er Quarz
- * 0x04001800: 96MHz mit 16er Quarz
- * 0x04002400: 144MHz mit 16er Quarz
- *
- * 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
- * |XXX|--PD---|-------MFD---------|XXX|--MFI--|-----MFN-----------|
- */
-
-#define CONFIG_SYS_OSC32 32768 /* 32768 or 32000 Hz crystal */
-#undef CONFIG_SYS_OSC16 /* there is no external 16MHz external clock */
-
-/* MPU CLOCK source before PLL (should be named CONFIG_SYS_SYS_CLK_FREQ) */
-#define CONFIG_SYS_CLK_FREQ (512*CONFIG_SYS_OSC32)
-#define CONFIG_SYS_MPCTL0_VAL 0x07B32DA5 /* 192.000017 MHz */
-#define CONFIG_SYS_MPCTL1_VAL 0
-
-/* system clock source before PLL (should be named CONFIG_SYS_SYSPLL_CLK_FREQ)*/
-#ifndef CONFIG_SYS_OSC16
-#define CONFIG_SYSPLL_CLK_FREQ (512*CONFIG_SYS_OSC32)
-#if (CONFIG_SYS_OSC32 == 32000)
-#define CONFIG_SYS...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2012-04-02 23:19: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 4aefb2f3e1f6e2c99fe299d9ae52e52a8d21e908 (commit)
from e37170d0bfd916cee3d691b0013987d2b476375b (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 4aefb2f3e1f6e2c99fe299d9ae52e52a8d21e908
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 3 01:21:11 2012 +0200
[BUILDROOT] rework u-boot binary target name and cleanup patch
- use U-Boot and Buildroot naming convention prefixed with the board name
- Use hooks instead of a buidlroot patch to customize the U-Boot target
- create a link to the legacy file name (apfXX-u-boot.bin) to support futur board upgrade
- remove all useless U-Boot variables
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Makefile.in | 22 ++++++++++----------
...ot-makes_binary_targets_name_overloadable.patch | 21 -------------------
2 files changed, 11 insertions(+), 32 deletions(-)
delete mode 100644 patches/buildroot/2012.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 81a3964..3b69cfc 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -9,16 +9,16 @@ ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
# for old BR:
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
-U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
-ifeq ($(CPU_NAME),imxl)
-U_BOOT_BIN=u-boot.bin
-else ifeq ($(CPU_NAME),imx28)
-U_BOOT_BIN=u-boot.sb
-UBOOT_MAKE_TARGET:=${U_BOOT_BIN}
-U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.sb
-else
-U_BOOT_BIN=u-boot-nand.bin
-UBOOT_MAKE_TARGET:=${U_BOOT_BIN}
-endif
+define UBOOT_POST_INSTALL_IMAGES_ACTION
+ @if [ -e "$(BINARIES_DIR)/$(UBOOT_BIN)" ]; then \
+ rm -f $(BINARIES_DIR)/$(BOARD_NAME)-$(UBOOT_BIN) ;\
+ mv $(BINARIES_DIR)/$(UBOOT_BIN) $(BINARIES_DIR)/$(BOARD_NAME)-$(UBOOT_BIN) ; \
+ fi
+ @if [ ! -e "$(BINARIES_DIR)/$(BOARD_NAME)-u-boot.bin" ]; then \
+ ln -sf $(BINARIES_DIR)/$(BOARD_NAME)-$(UBOOT_BIN) $(BINARIES_DIR)/$(BOARD_NAME)-u-boot.bin ; \
+ fi
+endef
+
+UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_POST_INSTALL_IMAGES_ACTION
endif
diff --git a/patches/buildroot/2012.02/051h-u-boot-makes_binary_targets_name_overloadable.patch b/patches/buildroot/2012.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
deleted file mode 100644
index afb55ca..0000000
--- a/patches/buildroot/2012.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Allow board custom Makefiles to choose the name of the U-Boot's resulting binary
-and the name it should take when copied to $(BINARIES_DIR).
-
-Specific for Armadeus.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-Signed-off-by: Eric Jarrige <eri...@ar...>
-
-Index: buildroot/boot/uboot/uboot.mk
-===================================================================
---- buildroot.orig/boot/uboot/uboot.mk 2012-02-21 16:44:28.000000000 +0100
-+++ buildroot/boot/uboot/uboot.mk 2012-02-21 16:44:29.000000000 +0100
-@@ -96,7 +96,7 @@
- endef
-
- define UBOOT_INSTALL_IMAGES_CMDS
-- cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
-+ cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
- endef
-
- $(eval $(call GENTARGETS))
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-30 15:31: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 e37170d0bfd916cee3d691b0013987d2b476375b (commit)
from 99d49763c8de93cb2c6b6445866ef5fd97b53272 (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 e37170d0bfd916cee3d691b0013987d2b476375b
Author: Eric Jarrige <eri...@ar...>
Date: Fri Mar 30 17:42:46 2012 +0200
[TOOLS] apf28: update recovering software and U-Boot binary image
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 2 +-
patches/u-boot/2011.12/502-add-apf28.patch | 6 +++---
software/uboot_recover/apf28-u-boot-spl | Bin 193422 -> 201517 bytes
software/uboot_recover/apf28-u-boot.sb | Bin 420320 -> 405424 bytes
software/uboot_recover/apf28-u-boot_recover.bd | 4 ++--
software/uboot_recover/apf28_recover.py | 4 ++--
6 files changed, 8 insertions(+), 8 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 2f38828..c9e46b1 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
@@ -120,7 +120,7 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_SYS_TEXT_BASE 0x44000000
+#define CONFIG_SYS_TEXT_BASE 0x40000000
/*
* FLASH organization
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 6bcec47..21e2e7b 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -1350,9 +1350,9 @@
+ //----------------------------------------------------------
+ // Load and call U-Boot
+ //----------------------------------------------------------
-+ load u_boot > 0x44000000;
-+ load ivt (entry = 0x44000000) > 0x8000;
-+ hab call 0x8000;
++ load u_boot > 0x40000000;
++ load ivt (entry = 0x40000000) > 0x8000;
++ hab jump 0x8000;
+}
--- u-boot-2011.12/boards.cfg 2011-11-23 21:23:45.000000000 +0100
+++ u-boot-2011.12/boards.cfg 2011-11-27 11:32:23.174363004 +0100
diff --git a/software/uboot_recover/apf28-u-boot-spl b/software/uboot_recover/apf28-u-boot-spl
index 0936403..ed916ba 100755
Binary files a/software/uboot_recover/apf28-u-boot-spl and b/software/uboot_recover/apf28-u-boot-spl differ
diff --git a/software/uboot_recover/apf28-u-boot.sb b/software/uboot_recover/apf28-u-boot.sb
index f62c5dd..54a712f 100644
Binary files a/software/uboot_recover/apf28-u-boot.sb and b/software/uboot_recover/apf28-u-boot.sb differ
diff --git a/software/uboot_recover/apf28-u-boot_recover.bd b/software/uboot_recover/apf28-u-boot_recover.bd
index 4d53b25..ea8fd7b 100644
--- a/software/uboot_recover/apf28-u-boot_recover.bd
+++ b/software/uboot_recover/apf28-u-boot_recover.bd
@@ -15,6 +15,6 @@ section (0) {
//----------------------------------------------------------
// Load U-Boot and env script to setup NAND flash
//----------------------------------------------------------
- load u_boot_sb > 0x40000000;
- load u_boot_env > 0x41000100;
+ load u_boot_sb > 0x41000000;
+ load u_boot_env > 0x42000000;
}
diff --git a/software/uboot_recover/apf28_recover.py b/software/uboot_recover/apf28_recover.py
index 67b410c..3d00c89 100644
--- a/software/uboot_recover/apf28_recover.py
+++ b/software/uboot_recover/apf28_recover.py
@@ -137,7 +137,7 @@ if __name__ == "__main__":
ELFTOSB_APP = "../../buildroot/output/host/usr/bin/elftosb"
NAND_BINARY = "apf28_nand_recover.sb"
ENV_RECOVER = "apf28_env_recover.txt"
- ENV_DOWNLOAD = 0x41000100
+ ENV_DOWNLOAD = 0x42000000
print "\n--- APF28 Bootstrap Tool ---\n"
print "Procedure to follow:"
@@ -176,7 +176,7 @@ if __name__ == "__main__":
fsize = "%08x" % os.path.getsize(BINARY)
envfile = open(ENV_RECOVER, 'w')
- envfile.write("fileaddr=40000000\n")
+ envfile.write("fileaddr=41000000\n")
envfile.write("filesize=%s\n" % fsize)
envfile.close()
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-30 14:08: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 99d49763c8de93cb2c6b6445866ef5fd97b53272 (commit)
via d04dd6796fdbcecdae1b6c50c877f30d6bc05959 (commit)
from c4dcc7715a907a2906a36f13b563bc8ad5b92a44 (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 99d49763c8de93cb2c6b6445866ef5fd97b53272
Author: Eric Jarrige <eri...@ar...>
Date: Fri Mar 30 16:19:33 2012 +0200
[UBOOT][APF28] fix ocotp bug to read fuse at any address
commit d04dd6796fdbcecdae1b6c50c877f30d6bc05959
Author: Eric Jarrige <eri...@ar...>
Date: Fri Mar 30 16:18:35 2012 +0200
[UBOOT][APF28] still improving environment variables
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 27 ++++++++++---------
patches/u-boot/2011.12/502-add-apf28.patch | 2 +-
2 files changed, 15 insertions(+), 14 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 81cfa2f..2f38828 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
@@ -25,7 +25,7 @@
#include <asm/arch/regs-base.h>
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.7"
+#define CONFIG_ENV_VERSION "0.8"
#define CONFIG_IDENT_STRING " apf28 patch 0.8"
#define CONFIG_BOARD_NAME apf28
@@ -181,10 +181,11 @@
#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/mtdblock6 rootfstype=ubifs " MTDPARTS_DEFAULT
+#define CONFIG_BOOTARGS "console=" MK_STR(ACFG_CONSOLE_DEV) "," \
+ MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+ " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
-#define CONFIG_CONSOLE "console=ttyAM0,"MK_STR(CONFIG_BAUDRATE)
+#define ACFG_CONSOLE_DEV ttyAM0
#define CONFIG_BOOTCOMMAND "run ubifsboot"
#define CONFIG_SYS_AUTOLOAD "no"
/*
@@ -199,7 +200,7 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
- "console=" CONFIG_CONSOLE "\0" \
+ "consoledev=" MK_STR(ACFG_CONSOLE_DEV) "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nand0,6\0" \
"u-boot_addr=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0" \
@@ -216,14 +217,14 @@
"addipargs=setenv bootargs ${bootargs} " \
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
"${hostname}:eth0:off\0" \
- "nfsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addnfsargs addipargs; setenv autostart yes;" \
+ "nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
"nboot kernel\0" \
- "ubifsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addubifsargs addipargs; setenv autostart yes;" \
- "nboot 40800000 0 ${kernel_addr}\0" \
- "mmcboot=setenv bootargs ${console} ${mtdparts};" \
- "run addmmcargs addipargs; setenv autostart yes;" \
+ "ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts};run addubifsargs addipargs; setenv autostart yes;"\
+ "nboot kernel\0" \
+ "mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts}; run addmmcargs addipargs; setenv autostart yes;" \
"nboot kernel\0" \
"flash_uboot=if bcb nand.write ; then " \
"nand erase ${u-boot_addr} ${u-boot_len} ; " \
@@ -327,7 +328,7 @@
/*
* Fuses - OCOTP
*/
-#define CONFIG_IMX_OCOTP
+/* #define CONFIG_IMX_OCOTP */
#define IMX_OCOTP_BASE MXS_OCOTP_BASE
/*
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index f56fd93..6bcec47 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -326,7 +326,7 @@
+ return val;
+ }
+
-+ val = readl(&ocotp_regs->hw_ocotp_cust0 + (addr << 4));
++ val = readl(&ocotp_regs->hw_ocotp_cust0 + (addr * 4));
+
+ writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_clr);
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-30 12:10: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 c4dcc7715a907a2906a36f13b563bc8ad5b92a44 (commit)
from 94f6562c8dda494177c2f51d787f9cd12c98763c (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 c4dcc7715a907a2906a36f13b563bc8ad5b92a44
Author: Eric Jarrige <eri...@ar...>
Date: Fri Mar 30 14:19:07 2012 +0200
[UBOOT][APF28] refactoring environment variables
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 82 ++++++++------------
patches/u-boot/2011.12/502-add-apf28.patch | 4 +-
2 files changed, 36 insertions(+), 50 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 4ae20c5..81cfa2f 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
@@ -25,8 +25,8 @@
#include <asm/arch/regs-base.h>
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.6"
-#define CONFIG_IDENT_STRING " apf28 patch 0.7"
+#define CONFIG_ENV_VERSION "0.7"
+#define CONFIG_IDENT_STRING " apf28 patch 0.8"
#define CONFIG_BOARD_NAME apf28
/*
@@ -72,7 +72,6 @@
#define CONFIG_BOOTP_DNS2
#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
-#define CONFIG_SRV_PATH ""
#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
/*
@@ -93,7 +92,6 @@
#define CONFIG_CMD_MMC
#define CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_NAND_LOCK_UNLOCK
#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
@@ -109,7 +107,6 @@
#define PHYS_SDRAM_1 0x40000000 /* Base address */
#define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MiB RAM */
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-/*#define CONFIG_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 */
@@ -139,18 +136,18 @@
#define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 512kB */
-#define CONFIG_KERNEL_OFFSET 0x00400000
-#define CONFIG_KERNEL_LEN 0x00800000 /* 8MB (BB ready) */
-#define CONFIG_ROOTFS_OFFSET 0x00C00000
-#define CONFIG_ROOTFS_LEN /* entire flash if not specified */
+#define CONFIG_KERNEL_OFFSET 0x00500000 /* 8MB */
+#define CONFIG_ROOTFS_OFFSET 0x00D00000
-#define CONFIG_MTDMAP "gpmi-nfc-main"
+#define CONFIG_MTDMAP "gpmi-nfc-main"
#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT \
"mtdparts=" CONFIG_MTDMAP \
- ":3M(bootloader)ro," \
- "512K(environment)," \
- "512K(redundant-environment)," \
+ ":3M(u-boot)ro," \
+ "512K(env)," \
+ "512K(env2)," \
+ "512K(dtb)," \
+ "512K(splash)," \
"8M(kernel)," \
"-(rootfs)"
@@ -185,7 +182,7 @@
#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
+ CONFIG_CONSOLE " root=/dev/mtdblock6 rootfstype=ubifs " MTDPARTS_DEFAULT
#define CONFIG_CONSOLE "console=ttyAM0,"MK_STR(CONFIG_BAUDRATE)
#define CONFIG_BOOTCOMMAND "run ubifsboot"
@@ -204,71 +201,60 @@
"env_version=" CONFIG_ENV_VERSION "\0" \
"console=" CONFIG_CONSOLE "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
- "partition=nand0,4\0" \
- "uboot_offset=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0" \
- "uboot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
- "env_offset=" MK_STR(CONFIG_ENV_OFFSET) "\0" \
- "env_len=" MK_STR(CONFIG_ENV_RANGE) "\0" \
- "kernel_offset=" MK_STR(CONFIG_KERNEL_OFFSET) "\0" \
- "kernel_len=" MK_STR(CONFIG_KERNEL_LEN) "\0" \
- "rootfs_offset=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
- "rootfs_len=" MK_STR(CONFIG_ROOTFS_LEN) "\0" \
+ "partition=nand0,6\0" \
+ "u-boot_addr=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0" \
+ "u-boot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
+ "kernel_addr=" MK_STR(CONFIG_KERNEL_OFFSET) "\0" \
+ "rootfs_addr=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
"board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
- "serverpath=" MK_STR(CONFIG_SRV_PATH) "\0" \
- "mmcroot=/dev/mmcblk0p1\0" \
- "mmcrootfstype=ext2\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
"addubifsargs=setenv bootargs ${bootargs} " \
"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
"addmmcargs=setenv bootargs ${bootargs} " \
- "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
+ "root=/dev/mmcblk0p1 rootfstype=ext2\0" \
"addipargs=setenv bootargs ${bootargs} " \
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
"${hostname}:eth0:off\0" \
"nfsboot=setenv bootargs ${console} ${mtdparts};" \
"run addnfsargs addipargs; setenv autostart yes;" \
- "nboot 40800000 0 ${kernel_offset}\0" \
+ "nboot kernel\0" \
"ubifsboot=setenv bootargs ${console} ${mtdparts};" \
"run addubifsargs addipargs; setenv autostart yes;" \
- "nboot 40800000 0 ${kernel_offset}\0" \
+ "nboot 40800000 0 ${kernel_addr}\0" \
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; setenv autostart yes;" \
- "nboot 40800000 0 ${kernel_offset}\0" \
- "flash_uboot=nand unlock;" \
- "if bcb nand.write ; then " \
- "nand erase ${uboot_offset} ${uboot_len} ; " \
- "nand write.trimffs ${fileaddr} ${uboot_offset} ${filesize};" \
- "nand erase ${uboot2_offset} ${uboot_len};" \
- "if nand write.trimffs ${fileaddr} ${uboot2_offset} ${filesize};"\
- "then nand lock; nand unlock ${env_offset};" \
- "echo Flashing of uboot succeed;" \
+ "nboot kernel\0" \
+ "flash_uboot=if bcb nand.write ; then " \
+ "nand erase ${u-boot_addr} ${u-boot_len} ; " \
+ "nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};" \
+ "nand erase ${u-boot2_addr} ${u-boot_len};" \
+ "if nand write.trimffs ${fileaddr} ${u-boot2_addr} ${filesize};"\
+ "then 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.trimffs ${fileaddr} ${kernel_offset} ${filesize};"\
+ "flash_kernel=nand erase.part kernel;" \
+ "if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
"then echo Flashing of kernel succeed;" \
"else echo Flashing of kernel failed;" \
"fi\0" \
"flash_rootfs=nand erase.part rootfs;" \
- "if nand write.trimffs ${fileaddr} ${rootfs_offset} ${filesize};"\
+ "if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
"fi\0" \
"flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
- "download_uboot=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-u-boot.sb\0" \
- "download_kernel=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-linux.bin\0" \
- "download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.ubi\0" \
+ "download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.sb\0" \
+ "download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
+ "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
"update_uboot=run download_uboot flash_uboot\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
"update_all=run download_kernel flash_kernel download_rootfs " \
- "flash_rootfs download_uboot flash_uboot\0"
+ "flash_rootfs download_uboot flash_uboot\0" \
+ "unlock_regs=echo unlock_reg not needed anymore\0"
/*
* Serial Driver
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index a8ac987..f56fd93 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -1082,9 +1082,9 @@
+ }
+
+ sprintf(buf, "0x%08x", fcb->firmware1_starting_sector * nand->writesize);
-+ setenv("uboot_offset", buf);
++ setenv("u-boot_addr", buf);
+ sprintf(buf, "0x%08x", fcb->firmware2_starting_sector * nand->writesize);
-+ setenv("uboot2_offset", buf);
++ setenv("u-boot2_addr", buf);
+
+ printf("NAND BCB tables updated\n");
+ ret = 0;
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-03-30 06:52: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 94f6562c8dda494177c2f51d787f9cd12c98763c (commit)
via 326dda11a57effcecfa3a3776b9e041e8e1385b3 (commit)
from f534f4cd0c4be986b91db66b1e64e8f72642a617 (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 94f6562c8dda494177c2f51d787f9cd12c98763c
Author: Julien Boibessot <jul...@ar...>
Date: Fri Mar 30 08:51:53 2012 +0200
[BUILD] Add info message in scripts/quiltify.sh
commit 326dda11a57effcecfa3a3776b9e041e8e1385b3
Author: Julien Boibessot <jul...@ar...>
Date: Fri Mar 30 08:48:53 2012 +0200
[BUILDROOT] Add firmware-imx package
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/183-firmware-imx-add_package.patch | 49 ++++++++++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
scripts/quiltify.sh | 1 +
3 files changed, 51 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/183-firmware-imx-add_package.patch
diff --git a/patches/buildroot/2012.02/183-firmware-imx-add_package.patch b/patches/buildroot/2012.02/183-firmware-imx-add_package.patch
new file mode 100644
index 0000000..76fec76
--- /dev/null
+++ b/patches/buildroot/2012.02/183-firmware-imx-add_package.patch
@@ -0,0 +1,49 @@
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/firmware-imx/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/firmware-imx/Config.in 2012-03-29 12:09:47.000000000 +0200
+@@ -0,0 +1,4 @@
++config BR2_PACKAGE_FIRMWARE_IMX
++ bool "firmware-imx"
++ help
++ Freescale's specific firmwares for i.MX processors family.
+Index: buildroot/package/firmware-imx/firmware-imx.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/firmware-imx/firmware-imx.mk 2012-03-29 15:21:35.000000000 +0200
+@@ -0,0 +1,20 @@
++#############################################################
++#
++# firmware-imx (i.MX firmwares from Freescale BSP)
++#
++#############################################################
++FIRMWARE_IMX_VERSION = 10.11.01
++FIRMWARE_IMX_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
++
++FIRMWARE_IMX_VPU_TARGET_DIR = $(TARGET_DIR)/lib/firmware/vpu/
++
++define FIRMWARE_IMX_INSTALL_TARGET_CMDS
++ mkdir -p $(FIRMWARE_IMX_VPU_TARGET_DIR)
++ install -D -m 755 $(@D)/firmware/vpu/vpu_fw_$(BR2_CPU_NAME).bin $(FIRMWARE_IMX_VPU_TARGET_DIR)
++endef
++
++define FIRMWARE_IMX_UNINSTALL_TARGET_CMDS
++ rm -rf $(FIRMWARE_IMX_VPU_TARGET_DIR)
++endef
++
++$(eval $(call GENTARGETS))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-03-29 15:09:34.000000000 +0200
++++ buildroot/package/Config.in 2012-03-29 15:10:35.000000000 +0200
+@@ -192,6 +192,7 @@
+ source "package/eeprog/Config.in"
+ source "package/fconfig/Config.in"
+ source "package/firmware/Config.in"
++source "package/firmware-imx/Config.in"
+ source "package/fis/Config.in"
+ source "package/gadgetfs-test/Config.in"
+ source "package/gdisk/Config.in"
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 570290a..0fcb2c9 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -67,3 +67,4 @@ rm -rf buildroot/package/gsmmux
rm -rf buildroot/package/imx-lib/
rm -rf buildroot/package/imx-test/
rm -rf buildroot/package/e2fsprogs/
+rm -rf buildroot/package/firmware-imx/
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 499b2f3..272affd 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -106,6 +106,7 @@ if [ "$1" == "export" ]; then
else
echo "No VCS found"
fi
+ echo -e "\n--- If you worked on Buildroot patches don't forget to eventually update patches/buildroot/201x.xx/cleanup.sh !\n"
exit 0
fi
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-29 20:31:38
|
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 f534f4cd0c4be986b91db66b1e64e8f72642a617 (commit)
via 867a6c1e6bff78171e4cb9c558a4b1fd6a9b1256 (commit)
from ccc879c15b7aa1d81259f2f90d3cb9f8406ddbc1 (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 f534f4cd0c4be986b91db66b1e64e8f72642a617
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 22:42:35 2012 +0200
[UBOOT] pps: configure pps dedicated lines and disable mmc driver
commit 867a6c1e6bff78171e4cb9c558a4b1fd6a9b1256
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 22:40:51 2012 +0200
[UBOOT] apf27: use CONFIG_CMD_MMC to enable sd bus init when needed
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 3 ++-
.../device/armadeus/pps/pps-u-boot-2011.12.h | 16 ++++++++--------
2 files changed, 10 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 bbe4dc3..8bafce3 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,6 @@
#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
#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
@@ -417,10 +416,12 @@
/*
* SD/MMC
*/
+#ifdef CONFIG_CMD_MMC
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MXC_MMC
#define CONFIG_MXC_MCI_REGS_BASE 0x10014000
+#endif
/*
* RTC
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
index fbc4005..ab5595f 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
@@ -88,7 +88,6 @@
#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
#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
@@ -417,17 +416,18 @@
/*
* SD/MMC
*/
+#ifdef CONFIG_CMD_MMC
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MXC_MMC
#define CONFIG_MXC_MCI_REGS_BASE 0x10014000
+#endif
/*
* RTC
*/
#define CONFIG_RTC_DS1374
#define CONFIG_SYS_RTC_BUS_NUM 0
-//#define DEBUG_RTC
/*
* Watchdog Config
@@ -737,20 +737,20 @@
#define CONFIG_SYS_GPR_A_VAL 0x00000000
#define CONFIG_SYS_PUEN_A_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DDIR_B_VAL 0x00000000
-#define CONFIG_SYS_OCR1_B_VAL 0x00000000
+#define CONFIG_SYS_DDIR_B_VAL 0x000001F0
+#define CONFIG_SYS_OCR1_B_VAL 0x0003ff00
#define CONFIG_SYS_OCR2_B_VAL 0x00000000
-#define CONFIG_SYS_ICFA1_B_VAL 0xFFFFFFFF
+#define CONFIG_SYS_ICFA1_B_VAL 0xFFFC00FF
#define CONFIG_SYS_ICFA2_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
+#define CONFIG_SYS_ICFB1_B_VAL 0xFFFC00FF
#define CONFIG_SYS_ICFB2_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_DR_B_VAL 0x00000000
+#define CONFIG_SYS_DR_B_VAL 0x000001F0
#define CONFIG_SYS_GIUS_B_VAL 0xFF3FFFF0
#define CONFIG_SYS_ICR1_B_VAL 0x00000000
#define CONFIG_SYS_ICR2_B_VAL 0x00000000
#define CONFIG_SYS_IMR_B_VAL 0x00000000
#define CONFIG_SYS_GPR_B_VAL 0x00000000
-#define CONFIG_SYS_PUEN_B_VAL 0xFFFFFFFF
+#define CONFIG_SYS_PUEN_B_VAL 0xFFFFFE0F
#define CONFIG_SYS_DDIR_C_VAL 0x00000000
#define CONFIG_SYS_OCR1_C_VAL 0x00000000
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-29 14:17: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 ccc879c15b7aa1d81259f2f90d3cb9f8406ddbc1 (commit)
from 993376f8aad315ae3a374e1fe6b964dbb12dc6e7 (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 ccc879c15b7aa1d81259f2f90d3cb9f8406ddbc1
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 16:28:15 2012 +0200
[BUILDROOT] pps: fix conflict between apf27 and pps board name
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/pps_defconfig | 2 +-
...apf27-u-boot-2011.12.h => pps-u-boot-2011.12.h} | 0
...madeus_specific_options_for_config_header.patch | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename buildroot/target/device/armadeus/pps/{apf27-u-boot-2011.12.h => pps-u-boot-2011.12.h} (100%)
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 1b86023..d6fd426 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -73,7 +73,7 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="apf27"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-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-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
diff --git a/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
similarity index 100%
rename from buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
rename to buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
diff --git a/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch b/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
index 01e9146..40d5c27 100644
--- a/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
+++ b/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
@@ -9,7 +9,7 @@ Index: buildroot/boot/uboot/uboot.mk
$(call insert_define,CONFIG_ETH1ADDR,$(BR2_TARGET_UBOOT_ETH1ADDR))
@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/config.h
+
-+ $(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(UBOOT_BOARD_NAME),g;"\
++ $(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),))
+ $(SED) "s,^#define CONFIG_SYS_SDRAM_MBYTE_SYZE.*,#define CONFIG_SYS_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-29 11:50: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 993376f8aad315ae3a374e1fe6b964dbb12dc6e7 (commit)
from f59ec0489354dd4be9d5cfa404138fec919daff2 (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 993376f8aad315ae3a374e1fe6b964dbb12dc6e7
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 14:01:33 2012 +0200
[BUILDROOT] Fix build of the UBoot binary image
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Makefile.in | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index c92cc6c..81a3964 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -9,11 +9,13 @@ ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
# for old BR:
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
+U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
ifeq ($(CPU_NAME),imxl)
U_BOOT_BIN=u-boot.bin
else ifeq ($(CPU_NAME),imx28)
U_BOOT_BIN=u-boot.sb
UBOOT_MAKE_TARGET:=${U_BOOT_BIN}
+U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.sb
else
U_BOOT_BIN=u-boot-nand.bin
UBOOT_MAKE_TARGET:=${U_BOOT_BIN}
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-29 11:21: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 f59ec0489354dd4be9d5cfa404138fec919daff2 (commit)
via 88626c37c2815e3b88e9c2b77aad01dac5a40bc8 (commit)
via 7e8b431058901f0d47e88266d4f1694ba787890f (commit)
via de27000cef068ab12749fb1d9d6a6351b977d41f (commit)
via 6c0bd88e286f6f460ac77ec2f68daba68520b79c (commit)
via 282c5cce78c426d2068f6e368c18329d7d9868ad (commit)
from 2f9a156e93c4ad7eff0b81a7d43be4fe274f18c1 (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 f59ec0489354dd4be9d5cfa404138fec919daff2
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 13:32:31 2012 +0200
[BUILDROOT] update USB downloader tool package
commit 88626c37c2815e3b88e9c2b77aad01dac5a40bc8
Merge: 7e8b431 2f9a156
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 13:24:00 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 7e8b431058901f0d47e88266d4f1694ba787890f
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 13:10:18 2012 +0200
[BUILDROOT] apf28: add USB downloader tool to the default config
commit de27000cef068ab12749fb1d9d6a6351b977d41f
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 13:07:52 2012 +0200
[BUILDROOT] clean-up after BR2012.02 migration
commit 6c0bd88e286f6f460ac77ec2f68daba68520b79c
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 13:06:11 2012 +0200
[BUILDROOT] clean-up after BR2012.02 migration
commit 282c5cce78c426d2068f6e368c18329d7d9868ad
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 13:01:53 2012 +0200
[BUILD] add missing QT creator cleanup before re-applying patches
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 1 +
.../armadeus/imx28-usb-downloader/Config.in | 4 ++--
.../imx28-usb-downloader/imx28-usb-downloader.mk | 6 +-----
buildroot/target/device/armadeus/Makefile.in | 3 ---
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 3 ++-
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 2 +-
.../device/armadeus/apf51/apf51-u-boot-2011.12.h | 2 +-
.../device/armadeus/pps/apf27-u-boot-2011.12.h | 3 ++-
...madeus_specific_options_for_config_header.patch | 10 ++--------
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
10 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 284789a..56ed6ef 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -34,6 +34,7 @@ BR2_BOARD_NAME="apf28"
BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_I2C_TOOLS=y
diff --git a/buildroot/package/armadeus/imx28-usb-downloader/Config.in b/buildroot/package/armadeus/imx28-usb-downloader/Config.in
index f556e50..9ddb009 100644
--- a/buildroot/package/armadeus/imx28-usb-downloader/Config.in
+++ b/buildroot/package/armadeus/imx28-usb-downloader/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_IMX28_USB_DOWNLOADER
+config BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER
bool "imx28-usb-downloader"
help
- Host tooll to download i.MX28 binary through USB.
+ Host tool to download i.MX28 binary through USB.
diff --git a/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk b/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
index 06f2f90..0d82fbc 100644
--- a/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
+++ b/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
@@ -33,10 +33,6 @@ define IMX28_USB_DOWNLOADER_INSTALL_TARGET_CMDS
$(TARGET_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
endef
-ifeq ($(BUILDROOT_VERSION),2011.05)
-$(eval $(call GENTARGETS,package,imx28-usb-downloader))
-$(eval $(call GENTARGETS,package,imx28-usb-downloader,host))
-else
$(eval $(call GENTARGETS,))
$(eval $(call GENTARGETS,host))
-endif
+
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 32cd523..c92cc6c 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -9,14 +9,11 @@ ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
# for old BR:
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
-U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
ifeq ($(CPU_NAME),imxl)
U_BOOT_BIN=u-boot.bin
else ifeq ($(CPU_NAME),imx28)
U_BOOT_BIN=u-boot.sb
UBOOT_MAKE_TARGET:=${U_BOOT_BIN}
-U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.sb
-TARGETS+=host-elftosb host-imx28-usb-downloader
else
U_BOOT_BIN=u-boot-nand.bin
UBOOT_MAKE_TARGET:=${U_BOOT_BIN}
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 c06b554..bbe4dc3 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
@@ -103,7 +103,8 @@
/*
* Memory configurations
*/
-#define CONFIG_NR_DRAM_BANKS 1
+#define CONFIG_NR_DRAM_POPULATED 1
+#define CONFIG_NR_DRAM_BANKS CONFIG_NR_DRAM_POPULATED
#define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
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 6ebc6f0..4ae20c5 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
@@ -341,7 +341,7 @@
/*
* Fuses - OCOTP
*/
-/*#define CONFIG_IMX_OCOTP*/
+#define CONFIG_IMX_OCOTP
#define IMX_OCOTP_BASE MXS_OCOTP_BASE
/*
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 735ae9c..a96665c 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
@@ -107,8 +107,8 @@
/*
* Memory configurations
*/
-#define CONFIG_NR_DRAM_BANKS 2
#define CONFIG_NR_DRAM_POPULATED 1
+#define CONFIG_NR_DRAM_BANKS 2
#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
diff --git a/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
index ccecdb5..fbc4005 100644
--- a/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
@@ -103,7 +103,8 @@
/*
* Memory configurations
*/
-#define CONFIG_NR_DRAM_BANKS 1
+#define CONFIG_NR_DRAM_POPULATED 1
+#define CONFIG_NR_DRAM_BANKS CONFIG_NR_DRAM_POPULATED
#define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
diff --git a/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch b/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
index f8f8e3d..01e9146 100644
--- a/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
+++ b/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
@@ -4,7 +4,7 @@ Index: buildroot/boot/uboot/uboot.mk
===================================================================
--- buildroot/boot/uboot/uboot.mk 2012-03-02 17:43:02.634245000 +0100
+++ buildroot/boot/uboot/uboot.mk 2012-03-08 17:13:34.000000000 +0100
-@@ -90,6 +90,23 @@ define UBOOT_CONFIGURE_CMDS
+@@ -90,6 +90,17 @@ define UBOOT_CONFIGURE_CMDS
$(call insert_define,CONFIG_ETHADDR,$(BR2_TARGET_UBOOT_ETHADDR))
$(call insert_define,CONFIG_ETH1ADDR,$(BR2_TARGET_UBOOT_ETH1ADDR))
@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/config.h
@@ -12,16 +12,10 @@ Index: buildroot/boot/uboot/uboot.mk
+ $(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(UBOOT_BOARD_NAME),g;"\
+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),))
-+ $(SED) "s,^#define CFG_SDRAM_MBYTE_SYZE.*,#define CFG_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
-+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+ $(SED) "s,^#define CONFIG_SYS_SDRAM_MBYTE_SYZE.*,#define CONFIG_SYS_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(endif)
-+$(ifneq ($(strip $(BR2_TARGET_ARMADEUS_NR_SDRAM)),"1"))
-+ $(SED) "s,^#define CONFIG_NR_DRAM_BANKS.*,#define CONFIG_NR_DRAM_BANKS $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
-+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
-+ $(SED) "s,^#define CONFIG_SYS_NR_DRAM_BANKS.*,#define CONFIG_SYS_NR_DRAM_BANKS $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
-+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
++$(ifneq ($(strip $(BR2_TARGET_ARMADEUS_NR_SDRAM)),))
+ $(SED) "s,^#define CONFIG_NR_DRAM_POPULATED.*,#define CONFIG_NR_DRAM_POPULATED $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
+ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(endif)
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 1ce2d7c..570290a 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -23,6 +23,7 @@ rm -rf buildroot/package/openobex/
rm -rf buildroot/package/lmbench/
rm -rf buildroot/package/tslib/
rm -rf buildroot/package/openssh/
+rm -rf buildroot/package/qtcreator
rm -rf buildroot/package/sdl/
rm -rf buildroot/package/sdlwater/
rm -rf buildroot/package/slideshow/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-03-29 09:26:44
|
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 2f9a156e93c4ad7eff0b81a7d43be4fe274f18c1 (commit)
from 3158bde6608b426d320810245489431019001eb8 (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 2f9a156e93c4ad7eff0b81a7d43be4fe274f18c1
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 29 11:26:03 2012 +0200
[BUILDROOT] Updates APF51xx default configs
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 6 ++----
buildroot/configs/apf51test_defconfig | 9 ++-------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 26f0830..72733b6 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -10,8 +10,6 @@ BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_BINUTILS_VERSION_2_20=y
-BR2_GCC_VERSION_4_4_X=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
BR2_ENABLE_LOCALE_PURGE=y
@@ -29,9 +27,9 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton/"
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
-BR2_ROOTFS_POST_BUILD_SCRIPT="target/device/armadeus/rootfs/post_build.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf51"
BR2_CPU_NAME="imx51"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 4f38825..855e357 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -10,8 +10,6 @@ BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_BINUTILS_VERSION_2_20=y
-BR2_GCC_VERSION_4_4_X=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
@@ -30,9 +28,9 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton/"
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
-BR2_ROOTFS_POST_BUILD_SCRIPT="target/device/armadeus/rootfs/post_build.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf51"
BR2_CPU_NAME="imx51"
@@ -141,9 +139,6 @@ BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
BR2_TARGET_ROOTFS_UBI=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-29 00:22:19
|
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 3158bde6608b426d320810245489431019001eb8 (commit)
from 7aba0cfc01815f6eb644779ff239c3d4db005c3c (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 3158bde6608b426d320810245489431019001eb8
Author: Eric Jarrige <eri...@ar...>
Date: Thu Mar 29 02:33:21 2012 +0200
[BUILROOT] update rxtx and use Buildroot AUTOTARGETS model
-----------------------------------------------------------------------
Summary of changes:
...patch => rxtx-2.1-7r2-001-remove-warning.patch} | 0
...a-1.6.patch => rxtx-2.1-7r2-fix-java-1.6.patch} | 0
buildroot/package/armadeus/rxtx/rxtx.mk | 59 ++------------------
3 files changed, 6 insertions(+), 53 deletions(-)
rename buildroot/package/armadeus/rxtx/{01-rxtx.patch => rxtx-2.1-7r2-001-remove-warning.patch} (100%)
rename buildroot/package/armadeus/rxtx/{02-rxtx-2.1-7r2-fix-java-1.6.patch => rxtx-2.1-7r2-fix-java-1.6.patch} (100%)
diff --git a/buildroot/package/armadeus/rxtx/01-rxtx.patch b/buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
similarity index 100%
rename from buildroot/package/armadeus/rxtx/01-rxtx.patch
rename to buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
diff --git a/buildroot/package/armadeus/rxtx/02-rxtx-2.1-7r2-fix-java-1.6.patch b/buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
similarity index 100%
rename from buildroot/package/armadeus/rxtx/02-rxtx-2.1-7r2-fix-java-1.6.patch
rename to buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
diff --git a/buildroot/package/armadeus/rxtx/rxtx.mk b/buildroot/package/armadeus/rxtx/rxtx.mk
index 4d69e1a..4b87182 100644
--- a/buildroot/package/armadeus/rxtx/rxtx.mk
+++ b/buildroot/package/armadeus/rxtx/rxtx.mk
@@ -3,58 +3,11 @@
# rxtx lib for java
#
#############################################################
-RXTX_LIB_VERSION:=2.1-7r2
-RXTX_LIB_SOURCE:=rxtx-$(RXTX_LIB_VERSION).zip
-RXTX_LIB_SITE:=http://rxtx.qbang.org/pub/rxtx/
-RXTX_LIB_DIR:=$(BUILD_DIR)/rxtx-$(RXTX_LIB_VERSION)
-RXTX_LIB_BINARY:=RXTXcomm.jar
-RXTX_LIB_TARGET_BINARY:=usr/lib/classpath
+RXTX_VERSION = 2.1-7r2
+RXTX_SOURCE = rxtx-$(RXTX_VERSION).tgz
+RXTX_SITE = http://rxtx.qbang.org/pub/rxtx/
+RXTX_DEPENDENCIES = classpath
+RXTX_INSTALL_TARGET_OPT = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
-$(DL_DIR)/$(RXTX_LIB_SOURCE):
- $(WGET) -P $(DL_DIR) $(RXTX_LIB_SITE)/$(RXTX_LIB_SOURCE)
+$(eval $(call AUTOTARGETS))
-$(RXTX_LIB_DIR)/.unpacked: $(DL_DIR)/$(RXTX_LIB_SOURCE)
- unzip $(DL_DIR)/$(RXTX_LIB_SOURCE) -d $(BUILD_DIR)
- toolchain/patch-kernel.sh $(RXTX_LIB_DIR) package/armadeus/rxtx *.patch
- touch $@
-
-$(RXTX_LIB_DIR)/.configured: $(RXTX_LIB_DIR)/.unpacked
- (cd $(RXTX_LIB_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- )
- touch $@
-
-$(RXTX_LIB_DIR)/$(RXTX_LIB_BINARY): $(RXTX_LIB_DIR)/.configured
- $(MAKE) -C $(RXTX_LIB_DIR)
-
-$(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY): $(RXTX_LIB_DIR)/$(RXTX_LIB_BINARY)
- cp -rdpf $(RXTX_LIB_DIR)/arm-unknown-linux-gnu/.libs/librxtx*.so* $(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY)
- cp -rdpf $(RXTX_LIB_DIR)/RXTXcomm.jar $(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY)/librxtx*.so*
-
-rxtx: uclibc classpath $(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY)
-
-rxtx-source: $(DL_DIR)/$(RXTX_LIB_SOURCE)
-
-rxtx-clean:
- rm -f $(addprefix $(TARGET_DIR)/$(RXTX_LIB_TARGET_BINARY),librxtx*.so* RXTXcomm.jar)
- -$(MAKE) -C $(RXTX_LIB_DIR) clean
-
-rxtx-dirclean:
- rm -rf $(RXTX_LIB_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_RXTX)),y)
-TARGETS+=rxtx
-endif
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-28 14:49:57
|
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 7aba0cfc01815f6eb644779ff239c3d4db005c3c (commit)
from f1ea8cabd5e3563fb95629b61f89ea6cdfb22455 (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 7aba0cfc01815f6eb644779ff239c3d4db005c3c
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 28 17:01:06 2012 +0200
[UBOOT] remove hard coded statis IP adress
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 5 -----
.../device/armadeus/apf51/apf51-u-boot-2011.12.h | 5 -----
.../armadeus/apf9328/apf9328-u-boot-2011.12.h | 6 ------
.../device/armadeus/pps/apf27-u-boot-2011.12.h | 5 -----
4 files changed, 0 insertions(+), 21 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 73df973..c06b554 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
@@ -67,11 +67,6 @@
#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"
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 92dac7c..735ae9c 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
@@ -77,11 +77,6 @@
#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"
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
index 137fdac..18b1ef4 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
@@ -60,12 +60,6 @@
#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
-#define CONFIG_ETHADDR
-#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_IPADDR 192.168.000.10
-#define CONFIG_GATEWAYIP 192.168.000.1
-#define CONFIG_SERVERIP 192.168.000.2
-
#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
#define CONFIG_SRV_PATH ""
#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
diff --git a/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
index 4ff8279..ccecdb5 100644
--- a/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
@@ -67,11 +67,6 @@
#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"
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-28 14:40:29
|
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 f1ea8cabd5e3563fb95629b61f89ea6cdfb22455 (commit)
from fd9ffac3b6202156550ed6bfb42af2acb4414ab9 (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 f1ea8cabd5e3563fb95629b61f89ea6cdfb22455
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 28 16:51:32 2012 +0200
[BUILDROOT] update and clean all board default configuration
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 11 +++++------
buildroot/configs/apf27_webradio_defconfig | 11 +++++------
buildroot/configs/apf27test_defconfig | 11 +++++------
buildroot/configs/apf28_defconfig | 1 -
buildroot/configs/apf51_defconfig | 11 +++++------
buildroot/configs/apf51test_defconfig | 11 +++++------
buildroot/configs/apf9328_defconfig | 11 +++++------
buildroot/configs/apf9328test_defconfig | 11 +++++------
buildroot/configs/pps_defconfig | 11 +++++------
9 files changed, 40 insertions(+), 49 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 7df04a6..0db0544 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -9,13 +9,11 @@ BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_VERSION_0_9_30=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_20=y
BR2_GCC_VERSION_4_4_X=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_6_7_1=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -23,7 +21,6 @@ BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
@@ -68,14 +65,16 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
-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-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
-BR2_TARGET_UBOOT_TOOL_ENV=y
-# BR2_TARGET_UBOOT_NETWORK is not set
+BR2_TARGET_UBOOT_NETWORK=y
+BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
+BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
+BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
+BR2_TARGET_UBOOT_ETHADDR=""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 0ff53a8..b4bf6c7 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -9,13 +9,11 @@ BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_VERSION_0_9_30=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_20=y
BR2_GCC_VERSION_4_4_X=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_6_7_1=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -23,7 +21,6 @@ BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
@@ -76,14 +73,16 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
-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-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
-BR2_TARGET_UBOOT_TOOL_ENV=y
-# BR2_TARGET_UBOOT_NETWORK is not set
+BR2_TARGET_UBOOT_NETWORK=y
+BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
+BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
+BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
+BR2_TARGET_UBOOT_ETHADDR=""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 5f5db5b..4cbe945 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -9,13 +9,11 @@ BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_VERSION_0_9_30=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_20=y
BR2_GCC_VERSION_4_4_X=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_6_7_1=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -23,7 +21,6 @@ BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
@@ -129,14 +126,16 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
-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-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
-BR2_TARGET_UBOOT_TOOL_ENV=y
-# BR2_TARGET_UBOOT_NETWORK is not set
+BR2_TARGET_UBOOT_NETWORK=y
+BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
+BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
+BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
+BR2_TARGET_UBOOT_ETHADDR=""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 7901e5a..284789a 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -9,7 +9,6 @@ BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
-BR2_UCLIBC_VERSION_0_9_33=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_22=y
BR2_PACKAGE_GDB_SERVER=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index fe04b96..26f0830 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -9,13 +9,11 @@ BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
-BR2_UCLIBC_VERSION_0_9_30=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_20=y
BR2_GCC_VERSION_4_4_X=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_6_7_1=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
# BR2_SOFT_FLOAT is not set
@@ -24,7 +22,6 @@ BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_VFP_FLOAT=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
@@ -76,14 +73,16 @@ 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-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-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
-BR2_TARGET_UBOOT_TOOL_ENV=y
-# BR2_TARGET_UBOOT_NETWORK is not set
+BR2_TARGET_UBOOT_NETWORK=y
+BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
+BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
+BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
+BR2_TARGET_UBOOT_ETHADDR=""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index d2e2d0c..4f38825 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -9,14 +9,12 @@ BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
-BR2_UCLIBC_VERSION_0_9_30=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_20=y
BR2_GCC_VERSION_4_4_X=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_6_7_1=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
# BR2_SOFT_FLOAT is not set
@@ -25,7 +23,6 @@ BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_VFP_FLOAT=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
@@ -151,14 +148,16 @@ 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-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-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
-BR2_TARGET_UBOOT_TOOL_ENV=y
-# BR2_TARGET_UBOOT_NETWORK is not set
+BR2_TARGET_UBOOT_NETWORK=y
+BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
+BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
+BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
+BR2_TARGET_UBOOT_ETHADDR=""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index a1bc64c..f1e9fa9 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -9,13 +9,11 @@ BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_VERSION_0_9_30=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_20=y
BR2_GCC_VERSION_4_4_X=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_6_7_1=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -23,7 +21,6 @@ BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
@@ -59,13 +56,15 @@ 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-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-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_TARGET_UBOOT_NETWORK=y
+BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
+BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
+BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
+BR2_TARGET_UBOOT_ETHADDR=""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index e44ea22..dad8fa9 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -9,13 +9,11 @@ BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_VERSION_0_9_30=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_20=y
BR2_GCC_VERSION_4_4_X=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_6_7_1=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -23,7 +21,6 @@ BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
@@ -102,13 +99,15 @@ 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-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-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_TARGET_UBOOT_NETWORK=y
+BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
+BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
+BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
+BR2_TARGET_UBOOT_ETHADDR=""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index b471222..1b86023 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -9,19 +9,16 @@ BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_VERSION_0_9_30=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_20=y
BR2_GCC_VERSION_4_4_X=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_6_7_1=y
BR2_TARGET_OPTIMIZATION="-Os -pipe"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
@@ -76,14 +73,16 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="apf27"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-u-boot-2011.12.h"
BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-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-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
-BR2_TARGET_UBOOT_TOOL_ENV=y
-# BR2_TARGET_UBOOT_NETWORK is not set
+BR2_TARGET_UBOOT_NETWORK=y
+BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
+BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
+BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
+BR2_TARGET_UBOOT_ETHADDR=""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-28 10:44:41
|
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 fd9ffac3b6202156550ed6bfb42af2acb4414ab9 (commit)
from 7b9778f1043c2f120f3bc5bcc88219bf876fbcde (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 fd9ffac3b6202156550ed6bfb42af2acb4414ab9
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 28 12:31:41 2012 +0200
[BUILDROOT] bump to Buildroot 2012.02
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 +--
buildroot/configs/apf27_defconfig | 2 ++
buildroot/configs/apf27_webradio_defconfig | 2 ++
buildroot/configs/apf27test_defconfig | 2 ++
buildroot/configs/apf28_defconfig | 1 +
buildroot/configs/apf51_defconfig | 2 ++
buildroot/configs/apf51test_defconfig | 2 ++
buildroot/configs/apf9328_defconfig | 1 +
buildroot/configs/apf9328test_defconfig | 1 +
buildroot/configs/pps_defconfig | 2 ++
10 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 58b9ff7..e27b95b 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,7 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-#BUILDROOT_VERSION:=2012.02
-BUILDROOT_VERSION:=2011.05
+BUILDROOT_VERSION:=2012.02
include ./Makefile.in
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index ce33db8..7df04a6 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -51,6 +51,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_IPROUTE2=y
@@ -72,6 +73,7 @@ BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
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_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_LINUX_KERNEL=y
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 448acc5..0ff53a8 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -60,6 +60,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_PYEXPAT=y
BR2_PACKAGE_TSLIB=y
@@ -80,6 +81,7 @@ BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
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_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_LINUX_KERNEL=y
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 87e399a..5f5db5b 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -95,6 +95,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_LUA_INTERPRETER=y
BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
@@ -133,6 +134,7 @@ BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
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_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_LINUX_KERNEL=y
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 9878790..7901e5a 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -40,6 +40,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LZO=y
BR2_PACKAGE_ZLIB=y
BR2_PACKAGE_TSLIB=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 8042772..fe04b96 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -59,6 +59,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBXML2=y
BR2_PACKAGE_BLUEZ3_UTILS=y
@@ -80,6 +81,7 @@ BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
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_FORMAT_NAND_BIN=y
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 1c7c29c..d2e2d0c 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -114,6 +114,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_LUA_INTERPRETER=y
BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
@@ -155,6 +156,7 @@ BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
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_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_LINUX_KERNEL=y
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 58063e2..a1bc64c 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -50,6 +50,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 5070ade..e44ea22 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -82,6 +82,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBUSB=y
BR2_PACKAGE_READLINE=y
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index cbf1e9e..b471222 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -49,6 +49,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_OPENSSL_BIN=y
BR2_PACKAGE_BOA=y
BR2_PACKAGE_BRIDGE=y
@@ -80,6 +81,7 @@ BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-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-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
+BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
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-28 09:53:18
|
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 7b9778f1043c2f120f3bc5bcc88219bf876fbcde (commit)
via 3d935585d7ed6453ec72eae20b1b3fb4d750dc63 (commit)
via 2097745995e8a88c4b2d18cbea64aa581bc341bd (commit)
from 8080081f70dce6398d02c9794e68d9f63ef35da9 (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 7b9778f1043c2f120f3bc5bcc88219bf876fbcde
Merge: 3d93558 8080081
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 28 12:04:11 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 3d935585d7ed6453ec72eae20b1b3fb4d750dc63
Merge: 2097745 d2c2c2d
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 28 12:03:32 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 2097745995e8a88c4b2d18cbea64aa581bc341bd
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 28 12:02:55 2012 +0200
[UBOOT] pps27: bump tu U-Boot 2011.12
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/pps_defconfig | 8 ++++----
.../armadeus/{apf27 => pps}/apf27-u-boot-2011.12.h | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
copy buildroot/target/device/armadeus/{apf27 => pps}/apf27-u-boot-2011.12.h (99%)
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 36ead96..cbf1e9e 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -75,11 +75,11 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="apf27"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-u-boot-1.3.4.h"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-u-boot-1.3.4.h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-u-boot-2011.12.h"
+BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-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/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
copy to buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
index 73df973..4ff8279 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
@@ -1,6 +1,6 @@
/*
*
- * Configuration settings for the Armadeus Project motherboard APF27
+ * Configuration settings for the Armadeus Project motherboard PPS27
*
* Copyright (C) 2008-2012 ej / Armadeus Project <eri...@ar...>
*
@@ -25,8 +25,8 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "2.2"
-#define CONFIG_IDENT_STRING " apf27 patch 2.9"
-#define CONFIG_BOARD_NAME apf27
+#define CONFIG_IDENT_STRING " pps patch 2.9"
+#define CONFIG_BOARD_NAME pps
/*
* SoC configurations
@@ -179,13 +179,13 @@
#define CONFIG_REVISION_TAG
#define CONFIG_OF_LIBFDT
*/
-#define CONFIG_BOOTDELAY 5
+#define CONFIG_BOOTDELAY 1
#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_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)" otg_mode=device"
#define CONFIG_BOOTCOMMAND "run ubifsboot"
#define CONFIG_SYS_AUTOLOAD "no"
/*
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-03-28 09:52:00
|
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 8080081f70dce6398d02c9794e68d9f63ef35da9 (commit)
via 49b20c1a0ba6ee3cc8d11dc11875ae76a37970f9 (commit)
from d2c2c2df065b785ff6c24af66d8ee33de860e590 (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 8080081f70dce6398d02c9794e68d9f63ef35da9
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 28 10:52:41 2012 +0200
Patch renaming
commit 49b20c1a0ba6ee3cc8d11dc11875ae76a37970f9
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 28 10:47:28 2012 +0200
[BUILDROOT] 2012.02: Fixes imx-lib & imx-test Linux dir
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/174-imx-lib-add_package.patch | 2 +-
.../2012.02/176-imx-test-add_package.patch | 6 +++---
...0126692-3-add_hw-events_and_srtc_drivers.patch} | 0
3 files changed, 4 insertions(+), 4 deletions(-)
rename patches/linux/2.6.38/{442-freescale-0034-ENGR00126692-3-add_hw-events_vpu_srtc_drivers.patch => 442-freescale-0034-ENGR00126692-3-add_hw-events_and_srtc_drivers.patch} (100%)
diff --git a/patches/buildroot/2012.02/174-imx-lib-add_package.patch b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
index aa29e73..a590c30 100644
--- a/patches/buildroot/2012.02/174-imx-lib-add_package.patch
+++ b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
@@ -34,7 +34,7 @@ Index: buildroot/package/imx-lib/imx-lib.mk
+ $(MAKE) CC="$(TARGET_CC)" \
+ PLATFORM=$(BUILD_PLATFORM) \
+ DIRS="sahara2 vpu" \
-+ CFLAGS="-fPIC -I$(LINUX26_DIR)/drivers/mxc/security/sahara2/include" \
++ CFLAGS="-fPIC -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include" \
+ -C $(@D)
+endef
+
diff --git a/patches/buildroot/2012.02/176-imx-test-add_package.patch b/patches/buildroot/2012.02/176-imx-test-add_package.patch
index 7c61840..1a3dce1 100644
--- a/patches/buildroot/2012.02/176-imx-test-add_package.patch
+++ b/patches/buildroot/2012.02/176-imx-test-add_package.patch
@@ -36,16 +36,16 @@ Index: buildroot/package/imx-test/imx-test.mk
+define IMX_TEST_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" \
+ VERBOSE="" \
-+ LINUXPATH=$(LINUX26_DIR) \
++ LINUXPATH=$(LINUX_DIR) \
+ CROSS_COMPILE="$(HOST_DIR)/usr/bin/arm-linux-" \
+ PLATFORM=$(BUILD_PLATFORM) \
+ DIRS="mxc_sahara_test mxc_scc2 mxc_spi_test mxc_vpu_test mxc_uart_test mxc_usb_test" \
-+ CFLAGS="$(BUILD_CFLAGS) -I$(LINUX26_DIR)/drivers/mxc/security/sahara2/include" \
++ CFLAGS="$(BUILD_CFLAGS) -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include" \
+ -C $(@D)
+endef
+
+define IMX_TEST_INSTALL_TARGET_CMDS
-+ $(MAKE) LINUXPATH=$(LINUX26_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) install -C $(@D)/module_test
++ $(MAKE) LINUXPATH=$(LINUX_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) install -C $(@D)/module_test
+ $(MAKE) DESTDIR=$(TARGET_DIR)/unit_tests PLATFORM=IMX51 install -C $(@D)
+endef
+
diff --git a/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-events_vpu_srtc_drivers.patch b/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-events_and_srtc_drivers.patch
similarity index 100%
rename from patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-events_vpu_srtc_drivers.patch
rename to patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-events_and_srtc_drivers.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-03-28 08:25:11
|
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 d2c2c2df065b785ff6c24af66d8ee33de860e590 (commit)
via 09a2ab1eeea6ce783b414680a6c77ec67bafb296 (commit)
via d22abc02b402a642366e3b9a96c9e8e13e09f534 (commit)
from c8e23408299d3142feead3145dee4933ffc7a949 (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 d2c2c2df065b785ff6c24af66d8ee33de860e590
Merge: 09a2ab1 c8e2340
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 28 10:22:56 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 09a2ab1eeea6ce783b414680a6c77ec67bafb296
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 28 10:21:22 2012 +0200
[LINUX] APF51: Add VPU device declaration
commit d22abc02b402a642366e3b9a96c9e8e13e09f534
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 28 10:15:49 2012 +0200
[TOOLS] quiltify.sh: fixes user choice description (there is no default)
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/400-armadeus-add_apf51_module.patch | 22 ++--
...ale-0034-ENGR00126692-3-add_hw-vpu_driver.patch | 92 +++++++++++++--
...0-add_scc2_and_sahara_drivers_without_rng.patch | 124 ++++++++++----------
scripts/quiltify.sh | 4 +-
4 files changed, 155 insertions(+), 87 deletions(-)
diff --git a/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch b/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
index 23bda11..be43fda 100644
--- a/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2011-08-26 10:45:02.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2011-10-20 16:47:37.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2012-03-26 16:38:15.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2012-03-28 09:59:58.000000000 +0200
@@ -162,4 +162,17 @@
Include support for MX50 reference design platform (RDP) board. This
includes specific configurations for the board and its peripherals.
@@ -22,8 +22,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile 2011-10-21 12:19:07.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile 2011-10-21 14:30:28.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile 2011-06-03 03:35:11.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile 2012-03-28 09:59:58.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
@@ -35,8 +35,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c 2011-10-21 14:32:58.000000000 +0200
-@@ -0,0 +1,508 @@
++++ linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c 2012-03-26 20:28:00.000000000 +0200
+@@ -0,0 +1,510 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus systems <su...@ar...>
@@ -522,6 +522,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
+
+ mxc_register_device(&mxc_scc_device, NULL);
+
++ mxc_register_device(&mxc_vpu_device, NULL);
++
+#ifdef CONFIG_MACH_APF51_HAS_BASEBOARD
+ apf51_baseboard_init();
+#endif
@@ -547,8 +549,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
+
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-10-21 12:19:07.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h 2011-10-21 12:21:14.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2012-03-26 16:38:16.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h 2012-03-26 16:38:17.000000000 +0200
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -569,8 +571,8 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h
}
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-10-21 12:21:14.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h 2011-10-21 12:21:14.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/irqs.h 2012-03-26 16:38:16.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h 2012-03-26 16:38:17.000000000 +0200
@@ -53,6 +53,8 @@
#define MXC_BOARD_IRQS 80
#elif defined CONFIG_MACH_APF27
diff --git a/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-vpu_driver.patch b/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-vpu_driver.patch
index e7855fe..6c40182 100644
--- a/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-vpu_driver.patch
+++ b/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-vpu_driver.patch
@@ -25,7 +25,7 @@ Signed-off-by: Dinh Nguyen <Din...@fr...>
Index: linux-2.6.38.8/drivers/mxc/vpu/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/vpu/Kconfig 2012-03-15 15:50:48.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/vpu/Kconfig 2012-03-26 16:38:20.000000000 +0200
@@ -0,0 +1,22 @@
+#
+# Codec configuration
@@ -52,7 +52,7 @@ Index: linux-2.6.38.8/drivers/mxc/vpu/Kconfig
Index: linux-2.6.38.8/drivers/mxc/vpu/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/vpu/Makefile 2012-03-14 22:37:24.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/vpu/Makefile 2012-03-26 16:38:20.000000000 +0200
@@ -0,0 +1,9 @@
+#
+# Makefile for the VPU drivers.
@@ -66,7 +66,7 @@ Index: linux-2.6.38.8/drivers/mxc/vpu/Makefile
Index: linux-2.6.38.8/drivers/mxc/vpu/mxc_vpu.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/vpu/mxc_vpu.c 2012-03-15 16:03:13.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/vpu/mxc_vpu.c 2012-03-26 16:38:20.000000000 +0200
@@ -0,0 +1,868 @@
+/*
+ * Copyright 2006-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -938,8 +938,8 @@ Index: linux-2.6.38.8/drivers/mxc/vpu/mxc_vpu.c
+module_exit(vpu_exit);
Index: linux-2.6.38.8/drivers/mxc/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2012-03-14 09:38:52.000000000 +0100
-+++ linux-2.6.38.8/drivers/mxc/Kconfig 2012-03-15 16:30:23.000000000 +0100
+--- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2012-03-26 16:38:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Kconfig 2012-03-28 08:55:26.000000000 +0200
@@ -5,6 +5,7 @@
menu "MXC support drivers"
@@ -950,15 +950,15 @@ Index: linux-2.6.38.8/drivers/mxc/Kconfig
Index: linux-2.6.38.8/drivers/mxc/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Makefile 2012-03-14 09:38:52.000000000 +0100
-+++ linux-2.6.38.8/drivers/mxc/Makefile 2012-03-15 16:30:23.000000000 +0100
+--- linux-2.6.38.8.orig/drivers/mxc/Makefile 2012-03-26 16:38:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Makefile 2012-03-28 08:55:26.000000000 +0200
@@ -1 +1,2 @@
+obj-$(CONFIG_MXC_VPU) += vpu/
obj-$(CONFIG_MXC_HWEVENT) += hw_event/
Index: linux-2.6.38.8/include/linux/fsl_devices.h
===================================================================
--- linux-2.6.38.8.orig/include/linux/fsl_devices.h 2011-06-03 03:35:11.000000000 +0200
-+++ linux-2.6.38.8/include/linux/fsl_devices.h 2012-03-15 16:30:22.000000000 +0100
++++ linux-2.6.38.8/include/linux/fsl_devices.h 2012-03-28 08:55:24.000000000 +0200
@@ -109,6 +109,12 @@
int(*voltage_set)(int slot, int vcc, int vpp);
};
@@ -974,8 +974,8 @@ Index: linux-2.6.38.8/include/linux/fsl_devices.h
* instead of just the clock).
Index: linux-2.6.38.8/arch/arm/mach-mx5/system.c
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/system.c 2012-03-14 09:38:52.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/mach-mx5/system.c 2012-03-15 16:30:22.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/system.c 2012-03-26 16:38:19.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/system.c 2012-03-28 08:55:24.000000000 +0200
@@ -82,3 +82,31 @@
__raw_writel(empgc1, MXC_SRPG_EMPGC1_SRPGCR);
}
@@ -1010,8 +1010,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/system.c
+EXPORT_SYMBOL(mxc_pg_disable);
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/mxc.h 2012-03-14 09:38:52.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc.h 2012-03-14 09:38:52.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/mxc.h 2012-03-26 16:38:19.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc.h 2012-03-26 16:38:20.000000000 +0200
@@ -176,6 +176,9 @@
#endif
@@ -1025,7 +1025,7 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc.h
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc_vpu.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc_vpu.h 2012-03-14 18:58:08.000000000 +0100
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc_vpu.h 2012-03-26 16:38:20.000000000 +0200
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -1115,3 +1115,69 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc_vpu.h
+#define VPU_WAKE_REG_VALUE 11
+
+#endif
+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-26 17:10:53.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-28 08:56:35.000000000 +0200
+@@ -1214,11 +1214,15 @@
+ /* FEC */
+ DEFINE_CLOCK(fec_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG12_OFFSET,
+ NULL, NULL, &ipg_clk, NULL);
+-
++
+ /* NFC */
+ DEFINE_CLOCK_CCGR(nfc_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG10_OFFSET,
+ clk_nfc, &emi_slow_clk, NULL);
+
++/* VPU */
++DEFINE_CLOCK(vpu_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG4_OFFSET,
++ NULL, NULL, &ahb_clk, NULL);
++
+ /* SSI */
+ DEFINE_CLOCK(ssi1_ipg_clk, 0, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG8_OFFSET,
+ NULL, NULL, &ipg_clk, NULL);
+@@ -1315,6 +1319,7 @@
+ _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
+ _REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk)
+ _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk)
++ _REGISTER_CLOCK("mxc_vpu.0", NULL, vpu_clk)
+ _REGISTER_CLOCK(NULL, "ckih", ckih_clk)
+ _REGISTER_CLOCK(NULL, "ckih2", ckih2_clk)
+ _REGISTER_CLOCK(NULL, "gpt_32k", gpt_32k_clk)
+Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.c
+===================================================================
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.c 2012-03-26 16:53:58.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/devices.c 2012-03-28 08:55:27.000000000 +0200
+@@ -182,3 +182,23 @@
+ return mxc_gpio_init(mxc_gpio_ports, ARRAY_SIZE(mxc_gpio_ports));
+ }
+
++static struct resource vpu_resources[] = {
++ {
++ .start = MX51_VPU_BASE_ADDR,
++ .end = MX51_VPU_BASE_ADDR + SZ_4K - 1,
++ .flags = IORESOURCE_MEM,
++ },
++ {
++ .start = MX51_MXC_INT_VPU,
++ .end = MX51_MXC_INT_VPU,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++struct platform_device mxc_vpu_device = {
++ .name = "mxc_vpu",
++ .id = 0,
++ .num_resources = ARRAY_SIZE(vpu_resources),
++ .resource = vpu_resources,
++};
++
+Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.h
+===================================================================
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.h 2012-03-26 16:58:18.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/devices.h 2012-03-28 08:55:27.000000000 +0200
+@@ -3,3 +3,4 @@
+ extern struct platform_device mxc_usbh2_device;
+ extern struct platform_device mxc_usbdr_udc_device;
+ extern struct platform_device mxc_hsi2c_device;
++extern struct platform_device mxc_vpu_device;
diff --git a/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch b/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
index 1558f2a..b741baf 100644
--- a/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
+++ b/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
@@ -60,8 +60,8 @@ Signed-off-by: Anish Trivedi <an...@fr...>
Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/security/Kconfig 2011-10-20 19:20:21.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/security/Kconfig 2011-10-20 19:22:51.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/security/Kconfig 2012-03-28 10:01:28.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Kconfig 2012-03-28 10:01:36.000000000 +0200
@@ -8,4 +8,57 @@
This module contains the core API's for accessing the DryIce module.
If you are unsure about this, say N here.
@@ -122,8 +122,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
endmenu
Index: linux-2.6.38.8/drivers/mxc/security/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/security/Makefile 2011-10-20 19:20:21.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/security/Makefile 2011-10-20 19:22:51.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/security/Makefile 2012-03-28 10:01:28.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Makefile 2012-03-28 10:01:36.000000000 +0200
@@ -1 +1,11 @@
obj-$(CONFIG_MXC_DRYICE) += dryice.o
+# Makefile for the Linux MXC Security API
@@ -139,7 +139,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/Makefile
Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/mxc_scc.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/mxc_scc.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,2386 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -2530,7 +2530,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc.c
Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,498 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3033,7 +3033,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,35 @@
+menu "SAHARA2 Security Hardware Support"
+
@@ -3073,7 +3073,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,47 @@
+# Makefile for the Linux Sahara2 driver
+#
@@ -3125,7 +3125,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,706 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3836,7 +3836,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4027,7 +4027,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4298,7 +4298,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,837 @@
+/*
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5140,7 +5140,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5241,7 +5241,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5527,7 +5527,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5669,7 +5669,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,967 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6641,7 +6641,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6759,7 +6759,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6880,7 +6880,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -7046,7 +7046,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,2515 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -9566,7 +9566,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,475 @@
+/*
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -10046,7 +10046,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,1829 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11880,7 +11880,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2005-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11900,7 +11900,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,1453 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13358,7 +13358,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13465,7 +13465,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13569,7 +13569,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interfac
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13616,7 +13616,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13734,7 +13734,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13818,7 +13818,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13886,7 +13886,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -14119,7 +14119,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,2265 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16389,7 +16389,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16443,7 +16443,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,466 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16914,7 +16914,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,849 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -17768,7 +17768,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,2185 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -19958,7 +19958,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,808 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -20771,7 +20771,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -20992,7 +20992,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,2356 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23353,7 +23353,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23607,7 +23607,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,1050 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -24662,7 +24662,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,734 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -25401,7 +25401,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,1390 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -26796,7 +26796,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c
Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/scc2_driver.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/scc2_driver.c 2012-03-28 10:01:37.000000000 +0200
@@ -0,0 +1,2395 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -29196,7 +29196,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/scc2_internals.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/scc2_internals.h 2012-03-28 10:01:37.000000000 +0200
@@ -0,0 +1,519 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -29719,8 +29719,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
+#endif /* SCC_INTERNALS_H */
Index: linux-2.6.38.8/drivers/mxc/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2011-10-20 19:18:47.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/Kconfig 2011-10-20 19:22:51.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2012-03-28 10:01:12.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Kconfig 2012-03-28 10:01:37.000000000 +0200
@@ -6,6 +6,7 @@
source "drivers/mxc/hw_event/Kconfig"
@@ -29731,8 +29731,8 @@ Index: linux-2.6.38.8/drivers/mxc/Kconfig
Index: linux-2.6.38.8/drivers/mxc/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Makefile 2011-10-20 19:19:59.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/Makefile 2011-10-20 19:22:51.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/Makefile 2012-03-28 10:01:12.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Makefile 2012-03-28 10:01:37.000000000 +0200
@@ -1,2 +1,3 @@
obj-$(CONFIG_MXC_VPU) += vpu/
obj-$(CONFIG_MXC_HWEVENT) += hw_event/
@@ -29740,7 +29740,7 @@ Index: linux-2.6.38.8/drivers/mxc/Makefile
Index: linux-2.6.38.8/include/linux/mxc_scc2_driver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/include/linux/mxc_scc2_driver.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/include/linux/mxc_scc2_driver.h 2012-03-28 10:01:37.000000000 +0200
@@ -0,0 +1,975 @@
+
+/*
@@ -30720,7 +30720,7 @@ Index: linux-2.6.38.8/include/linux/mxc_scc2_driver.h
Index: linux-2.6.38.8/include/linux/mxc_scc_driver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/include/linux/mxc_scc_driver.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/include/linux/mxc_scc_driver.h 2012-03-28 10:01:37.000000000 +0200
@@ -0,0 +1,1031 @@
+
+/*
@@ -31755,9 +31755,9 @@ Index: linux-2.6.38.8/include/linux/mxc_scc_driver.h
+#endif /* __ASM_ARCH_MXC_SCC_DRIVER_H__ */
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 2011-10-20 19:16:38.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-10-20 19:22:51.000000000 +0200
-@@ -1255,6 +1255,10 @@
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-28 10:01:12.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-28 10:01:37.000000000 +0200
+@@ -1259,6 +1259,10 @@
DEFINE_CLOCK(sdma_clk, 1, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG15_OFFSET,
NULL, NULL, &ahb_clk, NULL);
@@ -31768,18 +31768,18 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
/* eSDHC */
DEFINE_CLOCK_FULL(esdhc1_ipg_clk, 0, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG0_OFFSET,
NULL, NULL, _clk_max_enable, _clk_max_disable, &ipg_clk, NULL);
-@@ -1315,6 +1319,7 @@
- _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
+@@ -1320,6 +1324,7 @@
_REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk)
_REGISTER_CLOCK("imx-sdma", NULL, sdma_clk)
+ _REGISTER_CLOCK("mxc_vpu.0", NULL, vpu_clk)
+ _REGISTER_CLOCK("imx-scc", NULL, scc_clk)
_REGISTER_CLOCK(NULL, "ckih", ckih_clk)
_REGISTER_CLOCK(NULL, "ckih2", ckih2_clk)
_REGISTER_CLOCK(NULL, "gpt_32k", gpt_32k_clk)
Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.c
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.c 2011-10-20 19:16:38.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/devices.c 2011-10-20 19:22:51.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.c 2012-03-28 10:01:12.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/devices.c 2012-03-28 10:01:37.000000000 +0200
@@ -120,6 +120,27 @@
},
};
@@ -31810,10 +31810,10 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.c
.chip.label = "gpio-0",
Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.h 2011-10-20 19:16:38.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/devices.h 2011-10-20 19:22:51.000000000 +0200
-@@ -3,3 +3,4 @@
- extern struct platform_device mxc_usbh2_device;
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.h 2012-03-28 10:01:12.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/devices.h 2012-03-28 10:01:37.000000000 +0200
+@@ -4,3 +4,4 @@
extern struct platform_device mxc_usbdr_udc_device;
extern struct platform_device mxc_hsi2c_device;
+ extern struct platform_device mxc_vpu_device;
+extern struct platform_device mxc_scc_device;
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 15af09b..499b2f3 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -52,10 +52,10 @@ make shell_env
. armadeus_env.sh
if [ "$1" != "export" ]; then
- ask_user_choice "What do you want to quiltify today ? ;-)" "Linux_(default) Buildroot U-Boot"
+ ask_user_choice "What do you want to quiltify today ? ;-)" "Linux Buildroot U-Boot"
fi
if [ "$1" == "export" ]; then
- ask_user_choice "What kind of quilt patches do you want to export ?" "Linux_(default) Buildroot U-Boot"
+ ask_user_choice "What kind of quilt patches do you want to export ?" "Linux Buildroot U-Boot"
fi
if [ "$answer" == "Buildroot" ]; then
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-28 08:07:44
|
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 c8e23408299d3142feead3145dee4933ffc7a949 (commit)
via e89aa4511cec22016bd2458f27ae3fe11176a949 (commit)
from 5281b043967c26bdae84b4fa57b93a12f1f7fc57 (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 c8e23408299d3142feead3145dee4933ffc7a949
Merge: e89aa45 5281b04
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 28 10:18:46 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit e89aa4511cec22016bd2458f27ae3fe11176a949
Author: Eric Jarrige <eri...@ar...>
Date: Wed Mar 28 10:06:03 2012 +0200
[UBOOT] import patch to support NAND flashing large files
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 2 +-
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 2 +-
.../device/armadeus/apf51/apf51-u-boot-2011.12.h | 2 +-
.../2011.12/350-nand_large_file_download.patch | 221 ++++++++++++++++++++
4 files changed, 224 insertions(+), 3 deletions(-)
create mode 100644 patches/u-boot/2011.12/350-nand_large_file_download.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 ce0215c..73df973 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
@@ -324,7 +324,7 @@
#define IMX27_NAND_16BITS
#define NAND_MAX_CHIPS 1
-/*#define CONFIG_SYS_DIRECT_FLASH_TFTP*/
+#define CONFIG_SYS_DIRECT_FLASH_TFTP
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_NAND_QUIET 1
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 20060f6..6ebc6f0 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
@@ -300,7 +300,7 @@
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
#define NAND_MAX_CHIPS 1
-/*#define CONFIG_SYS_DIRECT_FLASH_TFTP*/
+#define CONFIG_SYS_DIRECT_FLASH_TFTP
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_NAND_QUIET 1
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 2f5f8d8..92dac7c 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
@@ -313,7 +313,7 @@
#define CONFIG_SYS_NAND_LARGEPAGE
#define NAND_MAX_CHIPS 1
-/*#define CONFIG_SYS_DIRECT_FLASH_TFTP*/
+#define CONFIG_SYS_DIRECT_FLASH_TFTP
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_NAND_QUIET 1
diff --git a/patches/u-boot/2011.12/350-nand_large_file_download.patch b/patches/u-boot/2011.12/350-nand_large_file_download.patch
new file mode 100644
index 0000000..e370e73
--- /dev/null
+++ b/patches/u-boot/2011.12/350-nand_large_file_download.patch
@@ -0,0 +1,221 @@
+--- u-boot-custom/common/cmd_net.c 2011-12-23 20:25:35.000000000 +0100
++++ u-boot-custom/common/cmd_net.c 2012-03-28 09:25:20.000000000 +0200
+@@ -28,6 +28,10 @@
+ #include <command.h>
+ #include <net.h>
+
++#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
++int tftpboot2nand=0; /* set to 1 for tftp to nand direct */
++#endif
++
+ static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
+
+ int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+@@ -46,11 +50,19 @@ int do_tftpb (cmd_tbl_t *cmdtp, int flag
+ return netboot_common(TFTPGET, cmdtp, argc, argv);
+ }
+
++#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
++U_BOOT_CMD(
++ tftpboot, 4, 1, do_tftpb,
++ "boot image via network using TFTP protocol",
++ "[loadAddress] [[hostIPaddr:]bootfilename] [nand]"
++);
++#else
+ U_BOOT_CMD(
+ tftpboot, 3, 1, do_tftpb,
+ "boot image via network using TFTP protocol",
+ "[loadAddress] [[hostIPaddr:]bootfilename]"
+ );
++#endif
+
+ #ifdef CONFIG_CMD_TFTPPUT
+ int do_tftpput(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+@@ -192,6 +204,10 @@ static int netboot_common(enum proto_t p
+ int size;
+ ulong addr;
+
++#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
++ tftpboot2nand = 0;
++#endif
++
+ /* pre-set load_addr */
+ if ((s = getenv("loadaddr")) != NULL) {
+ load_addr = simple_strtoul(s, NULL, 16);
+@@ -219,8 +235,16 @@ static int netboot_common(enum proto_t p
+
+ break;
+
+-#ifdef CONFIG_CMD_TFTPPUT
+ case 4:
++#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
++ if( strcmp(argv[3],"nand") == 0 ) {
++ tftpboot2nand = 1;
++ load_addr = simple_strtoul(argv[1], NULL, 16);
++ copy_filename (BootFile, argv[2], sizeof(BootFile));
++ break;
++ }
++#endif
++#ifdef CONFIG_CMD_TFTPPUT
+ if (strict_strtoul(argv[1], 16, &save_addr) < 0 ||
+ strict_strtoul(argv[2], 16, &save_size) < 0) {
+ printf("Invalid address/size\n");
+--- u-boot-custom/net/tftp.c 2011-12-23 20:25:35.000000000 +0100
++++ u-boot-custom/net/tftp.c 2012-03-28 09:39:40.000000000 +0200
+@@ -12,6 +12,11 @@
+ #include "tftp.h"
+ #include "bootp.h"
+
++#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
++#include <nand.h>
++extern int tftpboot2nand;
++#endif
++
+ /* Well known TFTP port # */
+ #define WELL_KNOWN_PORT 69
+ /* Millisecs to timeout for lost pkt */
+@@ -113,8 +118,10 @@ static char default_filename[DEFAULT_NAM
+ static char tftp_filename[MAX_LEN];
+
+ #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
++#ifndef CONFIG_SYS_NO_FLASH
+ extern flash_info_t flash_info[];
+ #endif
++#endif
+
+ /* 512 is poor choice for ethernet, MTU is typically 1500.
+ * Minus eth.hdrs thats 1468. Can get 2x better throughput with
+@@ -157,12 +164,104 @@ mcast_cleanup(void)
+
+ #endif /* CONFIG_MCAST_TFTP */
+
++#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
++static int tftp_nand_write(nand_info_t *meminfo, uchar *src, unsigned long *offset, size_t *length )
++{
++ size_t written ;
++ int ret = 0;
++ loff_t offs;
++ int blockstart = -1;
++
++ /* find first non bad block */
++ do {
++ blockstart = (*offset) & (~meminfo->erasesize+1);
++ offs = blockstart;
++ ret = meminfo->block_isbad(meminfo, offs);
++
++ if (ret < 0) {
++ printf("Bad block check failed\n");
++ return -1;
++ }
++ if (ret == 1) {
++ (*offset) = blockstart + meminfo->erasesize;
++/* printf("\rBad block at 0x%lx "
++ "in erase block from "
++ "0x%x will be skipped. new offset %x\n",
++ (long) offs,
++ blockstart, *offset);*/
++ }
++ } while ((ret!=0) && (*offset < meminfo->size) );
++
++ if (*offset < meminfo->size)
++ /* write out the page data */
++ ret = nand_write(meminfo, *offset, length, src);
++/* ret = meminfo->write(meminfo,
++ *offset,
++ meminfo->oobblock,
++ &written,
++ src);*/
++ if (ret != 0) {
++ printf("writing NAND page at offset 0x%lx failed\n",
++ *offset);
++ return -1;
++ }
++ return ret;
++}
++
++static void tftp_2_nand(uchar * src, unsigned len)
++{
++ #define TFTP2NAND_BUFFER_SIZE 4096
++ static int temp_buf_offset;
++ static unsigned long nand_offset;
++ static u_char temp_buf[TFTP2NAND_BUFFER_SIZE];
++ size_t nand_page_size;
++ /* retrieve current nand infos */
++ nand_info_t *nand;
++ nand = &nand_info[nand_curr_device];
++
++ nand_page_size = nand->writesize;
++ if ((nand_page_size<<1) > TFTP2NAND_BUFFER_SIZE) {
++ printf("error: NAND page size too big\n");
++ NetState = NETLOOP_FAIL;
++ return;
++ }
++
++ if ((TftpBlkSize<<1) > TFTP2NAND_BUFFER_SIZE) {
++ printf("error: tftp block size too big\n");
++ NetState = NETLOOP_FAIL;
++ return;
++ }
++
++
++ if (TftpBlock == 1) { /* reset local nand buffer */
++ temp_buf_offset = 0;
++ nand_offset = load_addr;
++ }
++
++ if (len)
++ (void)memcpy((void *)(temp_buf + temp_buf_offset), src, len);
++ temp_buf_offset += len;
++ if ((temp_buf_offset >= nand_page_size) || (!len) ){
++ if( tftp_nand_write(nand, temp_buf, &nand_offset, &nand_page_size) ){
++ NetState = NETLOOP_FAIL;
++ return;
++ }
++ nand_offset += nand_page_size;
++ if (len){
++ temp_buf_offset -= nand_page_size;
++ (void)memcpy((void *)(temp_buf), (void *)(temp_buf+nand_page_size), temp_buf_offset);
++ }
++ }
++}
++#endif
++
+ static __inline__ void
+ store_block(unsigned block, uchar *src, unsigned len)
+ {
+ ulong offset = block * TftpBlkSize + TftpBlockWrapOffset;
+ ulong newsize = offset + len;
+ #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
++#ifndef CONFIG_SYS_NO_FLASH
+ int i, rc = 0;
+
+ for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
+@@ -184,6 +283,13 @@ store_block(unsigned block, uchar *src,
+ }
+ }
+ else
++#endif /* CONFIG_SYS_NO_FLASH */
++#ifdef CONFIG_CMD_NAND
++ if (tftpboot2nand) {
++ tftp_2_nand(src, len);
++ }
++ else
++#endif /* CONFIG_CMD_NAND */
+ #endif /* CONFIG_SYS_DIRECT_FLASH_TFTP */
+ {
+ (void)memcpy((void *)(load_addr + offset), src, len);
+@@ -295,6 +401,13 @@ static void update_block_number(void)
+ /* The TFTP get or put is complete */
+ static void tftp_complete(void)
+ {
++#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
++ /* complete write to nand with last buffer */
++ if (tftpboot2nand)
++ tftp_2_nand(NULL, 0);
++
++#endif /* defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP) */
++
+ #ifdef CONFIG_TFTP_TSIZE
+ /* Print hash marks for the last packet received */
+ while (TftpTsize && TftpNumchars < 49) {
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-27 16:30:56
|
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 5281b043967c26bdae84b4fa57b93a12f1f7fc57 (commit)
from 87d15fcd0d6ea619340539f1d91e880f09308840 (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 5281b043967c26bdae84b4fa57b93a12f1f7fc57
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 27 18:41:57 2012 +0200
[TOOLS] improve reliability of uboot recover tools
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf27_recover.py | 4 ++--
software/uboot_recover/apf51_recover.py | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/software/uboot_recover/apf27_recover.py b/software/uboot_recover/apf27_recover.py
index 4663ec5..30d4645 100644
--- a/software/uboot_recover/apf27_recover.py
+++ b/software/uboot_recover/apf27_recover.py
@@ -202,11 +202,11 @@ class apf27Bootloader:
b = 16-n # ensure always 4 bytes
#tr = unpack('B'*n,data)
self.port.write(data)
-
count = count + 16
if (count % 1024) == 0:
self.__displayProgress("%06d bytes" % count)
data = f.read(16)
+ time.sleep(0.001)
self.__displayProgress("%d bytes transfered" % count)
print ""
f.close()
@@ -336,9 +336,9 @@ class UBoot:
return self.__getOutput()
def waitForPrompt(self):
- #time.sleep(1)
self.serial.write("\003")
while not self.serial.inWaiting():
+ time.sleep(0.001)
self.serial.write("\003")
return self.__getOutput()
diff --git a/software/uboot_recover/apf51_recover.py b/software/uboot_recover/apf51_recover.py
index bdcdc29..634d1b5 100644
--- a/software/uboot_recover/apf51_recover.py
+++ b/software/uboot_recover/apf51_recover.py
@@ -432,6 +432,7 @@ class UBoot:
def waitForPrompt(self):
self.serial.write("\003")
while not self.serial.inWaiting():
+ time.sleep(0.001)
self.serial.write("\003")
return self.__getOutput()
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-03-27 12:21:29
|
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 87d15fcd0d6ea619340539f1d91e880f09308840 (commit)
from 366a6115f830fb73e86bf63271fd58c80b8341ed (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 87d15fcd0d6ea619340539f1d91e880f09308840
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 27 14:32:25 2012 +0200
[TOOLS] update apf27 uboot recover tool
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf27-u-boot.bin | Bin 226016 -> 372288 bytes
software/uboot_recover/apf27_recover.py | 12 ++++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/software/uboot_recover/apf27-u-boot.bin b/software/uboot_recover/apf27-u-boot.bin
index 74d6891..e9c202d 100644
Binary files a/software/uboot_recover/apf27-u-boot.bin and b/software/uboot_recover/apf27-u-boot.bin differ
diff --git a/software/uboot_recover/apf27_recover.py b/software/uboot_recover/apf27_recover.py
index 30500d6..4663ec5 100644
--- a/software/uboot_recover/apf27_recover.py
+++ b/software/uboot_recover/apf27_recover.py
@@ -118,7 +118,7 @@ class apf27Bootloader:
def __displayProgress(self, text):
sys.stdout.write(chr(13))
print text,
- sys.stdout.flush()
+ sys.stdout.flush()
# addr: address to read
# count: number of bytes to read
@@ -331,16 +331,20 @@ class UBoot:
self.bootstrap.download("A0000000", BINARY, fsize)
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")
+ #time.sleep(1)
+ self.serial.write("\003")
+ while not self.serial.inWaiting():
+ self.serial.write("\003")
return self.__getOutput()
def flash(self):
""" flash uboot """
+ self.serial.flushInput()
self.serial.write("run flash_uboot\n")
try:
ret = self.__getOutput()
@@ -365,7 +369,7 @@ if __name__ == "__main__":
ser = serial.Serial(port, SPEED, timeout=3)
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-27 10:55: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 366a6115f830fb73e86bf63271fd58c80b8341ed (commit)
via ee247d02e5009dc714fbec82c494345b7aae0860 (commit)
from b7de470530a894ad8b091188d33eb0722b0166b4 (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 366a6115f830fb73e86bf63271fd58c80b8341ed
Merge: ee247d0 b7de470
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 27 13:05:40 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit ee247d02e5009dc714fbec82c494345b7aae0860
Author: Eric Jarrige <eri...@ar...>
Date: Tue Mar 27 13:05:02 2012 +0200
[UBOOT] apf27: bump to U-Boot release 2011.12
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 8 ++++----
buildroot/configs/apf27_webradio_defconfig | 8 ++++----
buildroot/configs/apf27test_defconfig | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 58c82c5..ce33db8 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -67,11 +67,11 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=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/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 6fbfccf..448acc5 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -75,11 +75,11 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=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/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index b347804..87e399a 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -128,11 +128,11 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=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
|
