[oe] [PATCH][STABLE 4/4] u-boot_git: Add bug20 support

[Jens Seidel]

Hi Stefan,

a few useless remarks:

On Tue, Jun 15, 2010 at 08:15:27PM +0200, Stefan Schmidt wrote:
> From: Stefan Schmidt <stefan at buglabs.net>
 
> +diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
> +index 7fe6275..a7e8593 100644
> +--- a/board/ti/beagle/beagle.h
> ++++ b/board/ti/beagle/beagle.h
> +@@ -255,8 +255,8 @@ const omap3_sysinfo sysinfo = {
> +	MUX_VAL(CP(HSUSB0_DATA7),	(IEN  | PTD | DIS | M0)) /*HSUSB0_DATA7*/\
> +	MUX_VAL(CP(I2C1_SCL),		(IEN  | PTU | EN  | M0)) /*I2C1_SCL*/\
> +	MUX_VAL(CP(I2C1_SDA),		(IEN  | PTU | EN  | M0)) /*I2C1_SDA*/\
> +-	MUX_VAL(CP(I2C2_SCL),		(IEN  | PTU | EN  | M4)) /*GPIO_168*/\
> +-	MUX_VAL(CP(I2C2_SDA),		(IEN  | PTU | EN  | M4)) /*GPIO_183*/\
> ++	MUX_VAL(CP(I2C2_SCL),		(IEN  | PTU | EN  | M0)) /*GPIO_168*/\
> ++	MUX_VAL(CP(I2C2_SDA),		(IEN  | PTU | EN  | M0)) /*GPIO_183*/\
> +	MUX_VAL(CP(I2C3_SCL),		(IEN  | PTU | EN  | M0)) /*I2C3_SCL*/\
> +	MUX_VAL(CP(I2C3_SDA),		(IEN  | PTU | EN  | M0)) /*I2C3_SDA*/\
> +	MUX_VAL(CP(I2C4_SCL),		(IEN  | PTU | EN  | M0)) /*I2C4_SCL*/\
> +@@ -268,6 +268,7 @@ const omap3_sysinfo sysinfo = {
> +	MUX_VAL(CP(MCSPI1_CS0),		(IEN  | PTD | EN  | M0)) /*McSPI1_CS0*/\
> +	MUX_VAL(CP(MCSPI1_CS1),		(IDIS | PTD | EN  | M0)) /*McSPI1_CS1*/\
> +	MUX_VAL(CP(MCSPI1_CS2),		(IDIS | PTD | DIS | M4)) /*GPIO_176*/\
> ++>>>>>>> 6ca9da4d42aeb43df5ef29f7d0518009df583b2f

Is this a conflict marker?

> +@@ -507,9 +507,11 @@ unsigned char configure_mmc(mmc_card_data *mmc_card_cur)
> + unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt,
> +			void *dst)
> + {
> ++  //printf("mmc_bread...\n");
> +	omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data,
> +				(unsigned long *) dst);
> +-	return 1;
> ++	//return 1;
> ++	return blkcnt;

Don't commit such changes (comments), remove them!

> +diff --git a/lib_arm/board.c b/lib_arm/board.c
> +index e148739..f3c58ea 100644
> +--- a/lib_arm/board.c
> ++++ b/lib_arm/board.c
> +@@ -291,7 +291,6 @@ void start_armboot (void)
> +			hang ();
> +		}
> +	}
> +-

Are you sure about this change :-?

> +	/* armboot_start is defined in the board-specific linker script */
> +	mem_malloc_init (_armboot_start - CONFIG_SYS_MALLOC_LEN,
> +			CONFIG_SYS_MALLOC_LEN);

Jens