Blackfin: update tiny board settings (voltage/default env)

The tinyboards like to run at a little lower voltage than the default, and
they prefer to boot over the network.  For the latter, extend the common
code a little to make this easier.

Also fix the cm-bf527 env sector size while we're in here to reflect the
flash that is actually in use.

Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 0fbd8f4980be5cae2f2bcb13cf3187fab3d68609..3fc0fa0be3c18933e95547783ce6592211031378 100644 (file)
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -127,6 +127,9 @@
 #ifndef CONFIG_BOOTARGS_ROOT
 # define CONFIG_BOOTARGS_ROOT "/dev/mtdblock0 rw"
 #endif
+#ifndef FLASHBOOT_ENV_SETTINGS
+# define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20100000\0"
+#endif
 #define CONFIG_BOOTARGS        \
        "root=" CONFIG_BOOTARGS_ROOT " " \
        "clkin_hz=" MK_STR(CONFIG_CLKIN_HZ) " " \
@@ -211,7 +214,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        NAND_ENV_SETTINGS \
        NETWORK_ENV_SETTINGS \
-       "flashboot=bootm 0x20100000\0"
+       FLASHBOOT_ENV_SETTINGS
 
 /*
  * Network Settings

diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index 3d41bd1b51936edc22862d2266eba037104b05e6..ad1dd1296409418d13b96fc26123654f005b7fa1 100644 (file)
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -38,6 +38,9 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        4
 
+/* Decrease core voltage */
+#define CONFIG_VR_CTL_VAL (VLEV_120 | CLKBUFOE | FREQ_1000)
+
 
 /*
  * Memory Settings
@@ -105,7 +108,7 @@
 #define CONFIG_ENV_ADDR                0x20008000
 #define CONFIG_ENV_OFFSET      0x8000
 #define CONFIG_ENV_SIZE                0x8000
-#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_SECT_SIZE   0x8000
 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR
 
 
@@ -125,6 +128,10 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE    0
+#define CONFIG_BOOTCOMMAND     "run flashboot"
+#define FLASHBOOT_ENV_SETTINGS \
+       "flashboot=flread 20040000 1000000 300000;" \
+       "bootm 0x1000000\0"
 
 
 /*

diff --git a/include/configs/cm-bf533.h b/include/configs/cm-bf533.h
index 06eb2889e330cfb04c5bc790a19ded3e3217e102..75152964b61d8c358971630357199d80f866a953 100644 (file)
--- a/include/configs/cm-bf533.h
+++ b/include/configs/cm-bf533.h
@@ -38,6 +38,9 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        5
 
+/* Decrease core voltage */
+#define CONFIG_VR_CTL_VAL (VLEV_115 | GAIN_20 | FREQ_1000)
+
 
 /*
  * Memory Settings
@@ -93,6 +96,8 @@
  */
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_UART_CONSOLE    0
+#define CONFIG_BOOTCOMMAND     "run flashboot"
+#define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
 
 
 /*

diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index b243e1a523386a49d013014f246caa59e253ef47..0d68ebae2a294faffe03bd0a377ac470912a5aac 100644 (file)
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -38,6 +38,9 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        4
 
+/* Decrease core voltage */
+#define CONFIG_VR_CTL_VAL (VLEV_115 | CLKBUFOE | GAIN_20 | FREQ_1000)
+
 
 /*
  * Memory Settings
@@ -127,6 +130,10 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE    0
+#define CONFIG_BOOTCOMMAND     "run flashboot"
+#define FLASHBOOT_ENV_SETTINGS \
+       "flashboot=flread 20040000 1000000 300000;" \
+       "bootm 0x1000000\0"
 
 
 /*

diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 0ed596085883f71104986917f2c351744d6a42ac..c1179b0aee83d48a25c821c35e3e93051f05dab4 100644 (file)
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -131,6 +131,10 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE    0
+#define CONFIG_BOOTCOMMAND     "run flashboot"
+#define FLASHBOOT_ENV_SETTINGS \
+       "flashboot=flread 20040000 1000000 280000;" \
+       "bootm 0x1000000\0"
 
 
 /*
@@ -138,13 +142,4 @@
  */
 #include <configs/bfin_adi_common.h>
 
-#undef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND     "run flashboot"
-
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       NAND_ENV_SETTINGS \
-       NETWORK_ENV_SETTINGS \
-       "flashboot=flread 20040000 1000000 280000; bootm 0x1000000\0"
-
 #endif

diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index 9630f7de5de9e1f5f1d9a7daa6b898e505c57dbf..93c4c8ddc1ac71ff3954b1cd7f28f58d608fb3f6 100644 (file)
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -38,6 +38,9 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        4
 
+/* Decrease core voltage */
+#define CONFIG_VR_CTL_VAL (VLEV_115 | GAIN_20 | FREQ_1000)
+
 
 /*
  * Memory Settings
@@ -115,6 +118,8 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE    1
+#define CONFIG_BOOTCOMMAND     "run flashboot"
+#define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
 
 #ifndef __ADSPBF542__
 /* Don't waste time transferring a logo over the UART */

diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index 4a77435648e5f8a475cd7482818a21fe49ad6827..1741ed493211d9306a77b769097351ad5e88713e 100644 (file)
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -30,7 +30,7 @@
 #define CONFIG_PLL_BYPASS              0
 /* VCO_MULT controls the MSEL (multiplier) bits in PLL_CTL             */
 /* Values can range from 0-63 (where 0 means 64)                       */
-#define CONFIG_VCO_MULT                        22
+#define CONFIG_VCO_MULT                        20
 /* CCLK_DIV controls the core clock divider                            */
 /* Values can be 1, 2, 4, or 8 ONLY                                    */
 #define CONFIG_CCLK_DIV                        1
@@ -38,6 +38,9 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        5
 
+/* Decrease core voltage */
+#define CONFIG_VR_CTL_VAL (VLEV_110 | GAIN_20 | FREQ_1000)
+
 
 /*
  * Memory Settings
@@ -98,6 +101,8 @@
  */
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_UART_CONSOLE    0
+#define CONFIG_BOOTCOMMAND     "run flashboot"
+#define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
 
 
 /*

diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 9615ced6c5a295db141fc5ba35a07fb8d0d5cc48..5a5fbddac354337010060a41293a6a0c515d7b68 100644 (file)
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -38,6 +38,9 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        4
 
+/* Decrease core voltage */
+#define CONFIG_VR_CTL_VAL (VLEV_115 | CLKBUFOE | GAIN_20 | FREQ_1000)
+
 
 /*
  * Memory Settings
@@ -128,6 +131,10 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE    0
+#define CONFIG_BOOTCOMMAND     "run flashboot"
+#define FLASHBOOT_ENV_SETTINGS \
+       "flashboot=flread 20040000 1000000 280000;" \
+       "bootm 0x1000000\0"
 
 
 /*