Inicio Explorar Axuda
Rexistro Iniciar sesión
phyus
/
uboot-vybrid_public
8
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Merge branch 'master' of git://git.denx.de/u-boot-blackfin

Wolfgang Denk %!s(int64=15) %!d(string=hai) anos
pai
1d96cfe8f5 46a887949e
achega
eb4bf4c077
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 1 1
      include/configs/bf533-ezkit.h
  2. 1 1
      include/configs/bfin_adi_common.h

+ 1 - 1
include/configs/bf533-ezkit.h
Ver ficheiro 

@@ -85,7 +85,7 @@
 
 #define CONFIG_SYS_MAX_FLASH_BANKS	3
 
 #define CONFIG_SYS_MAX_FLASH_BANKS	3
 
 #define CONFIG_SYS_MAX_FLASH_SECT	40
 
 #define CONFIG_SYS_MAX_FLASH_SECT	40
 
 #define CONFIG_ENV_IS_IN_FLASH
 
 #define CONFIG_ENV_IS_IN_FLASH
 
-#define CONFIG_ENV_ADDR		0x20020000
 
+#define CONFIG_ENV_ADDR		0x20030000
 
 #define CONFIG_ENV_SECT_SIZE	0x10000
 
 #define CONFIG_ENV_SECT_SIZE	0x10000
 
 #define FLASH_TOT_SECT		40
 
 #define FLASH_TOT_SECT		40

+ 1 - 1
include/configs/bfin_adi_common.h
Ver ficheiro 

@@ -138,7 +138,7 @@
 
 		"uart" MK_STR(CONFIG_UART_CONSOLE) "," \
 
 		"uart" MK_STR(CONFIG_UART_CONSOLE) "," \
 
 		MK_STR(CONFIG_BAUDRATE) " " \
 
 		MK_STR(CONFIG_BAUDRATE) " " \
 
 	CONFIG_BOOTARGS_VIDEO \
 
 	CONFIG_BOOTARGS_VIDEO \
 
-	"console=ttyBF0," MK_STR(CONFIG_BAUDRATE)
 
+	"console=ttyBF" MK_STR(CONFIG_UART_CONSOLE) "," MK_STR(CONFIG_BAUDRATE)
 
 #if defined(CONFIG_CMD_NAND)
 
 #if defined(CONFIG_CMD_NAND)
 
 # define NAND_ENV_SETTINGS \
 
 # define NAND_ENV_SETTINGS \
 
 	"nandargs=set bootargs " CONFIG_BOOTARGS "\0" \
 
 	"nandargs=set bootargs " CONFIG_BOOTARGS "\0" \