r462 - in trunk/oe/packages/uboot: . files
laforge at gta01.hmw-consulting.de
laforge at gta01.hmw-consulting.de
Sat Dec 23 00:07:29 CET 2006
Author: laforge
Date: 2006-12-23 00:07:28 +0100 (Sat, 23 Dec 2006)
New Revision: 462
Added:
trunk/oe/packages/uboot/files/u-boot-20061030-gta01v4.patch
Modified:
trunk/oe/packages/uboot/uboot-gta01_0.0+cvs20061030.bb
Log:
add real u-boot support for GTA01v4 (correct GPIO initialization)
Added: trunk/oe/packages/uboot/files/u-boot-20061030-gta01v4.patch
===================================================================
--- trunk/oe/packages/uboot/files/u-boot-20061030-gta01v4.patch 2006-12-22 18:10:53 UTC (rev 461)
+++ trunk/oe/packages/uboot/files/u-boot-20061030-gta01v4.patch 2006-12-22 23:07:28 UTC (rev 462)
@@ -0,0 +1,122 @@
+Index: u-boot.git/Makefile
+===================================================================
+--- u-boot.git.orig/Makefile 2006-12-22 23:31:06.000000000 +0100
++++ u-boot.git/Makefile 2006-12-22 23:40:11.000000000 +0100
+@@ -1910,8 +1910,10 @@
+ qt2410_config : unconfig
+ @./mkconfig $(@:_config=) arm arm920t qt2410 NULL s3c24x0
+
+-gta01_config : unconfig
+- @./mkconfig $(@:_config=) arm arm920t gta01 NULL s3c24x0
++gta01_config \
++gta01v3_config \
++gta01v4_config : unconfig
++ @board/gta01/split_by_variant.sh $@
+
+ scb9328_config : unconfig
+ @$(MKCONFIG) $(@:_config=) arm arm920t scb9328 NULL imx
+Index: u-boot.git/board/gta01/gta01.c
+===================================================================
+--- u-boot.git.orig/board/gta01/gta01.c 2006-12-22 23:25:48.000000000 +0100
++++ u-boot.git/board/gta01/gta01.c 2006-12-22 23:59:08.000000000 +0100
+@@ -90,6 +90,7 @@
+ delay (8000);
+
+ /* set up the I/O ports */
++#if defined(CONFIG_ARCH_GTA01_v3)
+ gpio->GPACON = 0x007FFFFF;
+
+ gpio->GPBCON = 0x00005056;
+@@ -112,6 +113,34 @@
+
+ gpio->GPHCON = 0x0008FAAA;
+ gpio->GPHUP = 0x000007FF;
++#elif defined(CONFIG_ARCH_GTA01_v4)
++ gpio->GPACON = 0x005E47FF;
++
++ gpio->GPBCON = 0x00045016;
++ gpio->GPBUP = 0x000007FF;
++ gpio->GPBDAT |= 0x4; /* Set GBP2 to high (Flash power-up) */
++
++ gpio->GPCCON = 0xAAAA12A9;
++ gpio->GPCUP = 0x0000FFFF;
++
++ gpio->GPDCON = 0xAAAAAAAA;
++ gpio->GPDUP = 0x0000FFFF;
++
++ gpio->GPECON = 0xA02AAAAA;
++ gpio->GPEUP = 0x0000FFFF;
++
++ gpio->GPFCON = 0x0000aa09;
++ gpio->GPFUP = 0x000000FF;
++
++ gpio->GPGCON = 0xFF40F0C1;
++ gpio->GPGUP = 0x0000AFEF;
++
++ gpio->GPHCON = 0x0000FAAA;
++ gpio->GPHUP = 0x000007FF;
++
++#else
++#error Please define GTA01 version
++#endif
+
+ /* arch number of SMDK2410-Board */
+ gd->bd->bi_arch_number = MACH_TYPE_GTA01;
+Index: u-boot.git/board/gta01/split_by_variant.sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ u-boot.git/board/gta01/split_by_variant.sh 2006-12-22 23:34:53.000000000 +0100
+@@ -0,0 +1,36 @@
++#!/bin/sh
++# ---------------------------------------------------------
++# Set the core module defines according to Core Module
++# ---------------------------------------------------------
++# ---------------------------------------------------------
++# Set up the GTA01 type define
++# ---------------------------------------------------------
++
++mkdir -p ${obj}include
++if [ "$1" == "" ]
++then
++ echo "$0:: No parameters - using GTA01v3 config"
++ echo "#define CONFIG_ARCH_GTA01_v3" > ${obj}include/config.h
++else
++ case "$1" in
++ gta01v4_config)
++ echo "#define CONFIG_ARCH_GTA01_v4" > ${obj}include/config.h
++ ;;
++
++ gta01v3_config)
++ echo "#define CONFIG_ARCH_GTA01_v3" > ${obj}include/config.h
++ ;;
++
++
++ *)
++ echo "$0:: Unrecognised config - using gta01v3_config"
++ echo "#define CONFIG_ARCH_GTA01_v3" > ${obj}include/config.h
++ ;;
++
++ esac
++
++fi
++# ---------------------------------------------------------
++# Complete the configuration
++# ---------------------------------------------------------
++$MKCONFIG -a gta01 arm arm920t gta01 NULL s3c24x0
+Index: u-boot.git/include/configs/gta01.h
+===================================================================
+--- u-boot.git.orig/include/configs/gta01.h 2006-12-22 23:28:54.000000000 +0100
++++ u-boot.git/include/configs/gta01.h 2006-12-22 23:36:18.000000000 +0100
+@@ -125,7 +125,11 @@
+ * Miscellaneous configurable options
+ */
+ #define CFG_LONGHELP /* undef to save memory */
+-#define CFG_PROMPT "GTA01 # " /* Monitor Command Prompt */
++#if defined(CONFIG_ARCH_GTA01_v3)
++#define CFG_PROMPT "GTA01v3 # " /* Monitor Command Prompt */
++#elif defined(CONFIG_ARCH_GTA01_v4)
++#define CFG_PROMPT "GTA01v4 # " /* Monitor Command Prompt */
++#endif
+ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
+ #define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
+ #define CFG_MAXARGS 16 /* max number of command args */
Modified: trunk/oe/packages/uboot/uboot-gta01_0.0+cvs20061030.bb
===================================================================
--- trunk/oe/packages/uboot/uboot-gta01_0.0+cvs20061030.bb 2006-12-22 18:10:53 UTC (rev 461)
+++ trunk/oe/packages/uboot/uboot-gta01_0.0+cvs20061030.bb 2006-12-22 23:07:28 UTC (rev 462)
@@ -3,28 +3,32 @@
PRIORITY = "optional"
LICENSE = "GPL"
SRCDATE := "${PV}"
-PR = "r0"
+PR = "r1"
PROVIDES = "virtual/bootloader"
S = "${WORKDIR}/git"
SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git \
- file://u-boot-20061030-qt2410-gta01.patch;patch=1"
+ file://u-boot-20061030-qt2410-gta01.patch;patch=1 \
+ file://u-boot-20061030-gta01v4.patch;patch=1"
# file://gta01_*.h"
EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
TARGET_LDFLAGS = ""
-UBOOT_MACHINE = "gta01_config"
+UBOOT_MACHINES = "gta01v3 gta01v4"
inherit base
do_compile () {
for type in nand
do
- #install -m 0644 ${WORKDIR}/gta01_${type}.h include/configs/gta01.h
- oe_runmake ${UBOOT_MACHINE}
- oe_runmake all
- mv u-boot.bin u-boot_$type.bin
+ for machine in ${UBOOT_MACHINES}
+ do
+ #install -m 0644 ${WORKDIR}/${machine}_${type}.h include/configs/gta01.h
+ oe_runmake ${machine}_config
+ oe_runmake all
+ mv u-boot.bin u-boot_${machine}_${type}.bin
+ done
done
}
@@ -32,7 +36,10 @@
install -d ${DEPLOY_DIR_IMAGE}
for type in nand
do
- install ${S}/u-boot_$type.bin ${DEPLOY_DIR_IMAGE}/u-boot_$type-${MACHINE}-${DATETIME}.bin
+ for machine in ${UBOOT_MACHINES}
+ do
+ install ${S}/u-boot_${machine}_${type}.bin ${DEPLOY_DIR_IMAGE}/u-boot_${type}-${machine}-${DATETIME}.bin
+ done
done
install -m 0755 tools/mkimage ${STAGING_BINDIR}/uboot-mkimage
}
More information about the commitlog
mailing list