[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-227-gf59ec04
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-227-gf59ec04
|
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
|
