summaryrefslogtreecommitdiff
path: root/board/netstal
diff options
context:
space:
mode:
Diffstat (limited to 'board/netstal')
-rw-r--r--board/netstal/hcu4/u-boot.lds2
-rw-r--r--board/netstal/hcu5/README.txt2
-rw-r--r--board/netstal/hcu5/hcu5.c8
-rw-r--r--board/netstal/mcu25/u-boot.lds2
4 files changed, 7 insertions, 7 deletions
diff --git a/board/netstal/hcu4/u-boot.lds b/board/netstal/hcu4/u-boot.lds
index 3bcfea2..368e3a4d 100644
--- a/board/netstal/hcu4/u-boot.lds
+++ b/board/netstal/hcu4/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
/* . = env_offset;*/
-/* common/environment.o(.text)*/
+/* common/env_embedded.o(.text)*/
*(.text)
*(.fixup)
diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt
index c205108..75c0dd7 100644
--- a/board/netstal/hcu5/README.txt
+++ b/board/netstal/hcu5/README.txt
@@ -152,7 +152,7 @@ From now on our copy is in RAM and we will run from there,
CFG_EBC_PB0A, CFG_EBC_PB0C from hcu5.h
mem_malloc_init
malloc_bin_reloc
- spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM)
+ spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
env_relocated
misc_init_r(bd): (board/netstal/hcu5.c)
ethaddr mit serial number ergänzen
diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c
index 4ecdb25..f3428c2 100644
--- a/board/netstal/hcu5/hcu5.c
+++ b/board/netstal/hcu5/hcu5.c
@@ -240,18 +240,18 @@ int misc_init_r(void)
unsigned long usb2phy0cr, usb2h0cr = 0;
unsigned long sdr0_pfc1;
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
/* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN,
0xffffffff,
&flash_info[0]);
-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
- CFG_ENV_ADDR_REDUND,
- CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
+ CONFIG_ENV_ADDR_REDUND,
+ CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
#endif
diff --git a/board/netstal/mcu25/u-boot.lds b/board/netstal/mcu25/u-boot.lds
index 740bc9c..093c080 100644
--- a/board/netstal/mcu25/u-boot.lds
+++ b/board/netstal/mcu25/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
/* . = env_offset;*/
-/* common/environment.o(.text)*/
+/* common/env_embedded.o(.text)*/
*(.text)
*(.fixup)