From 584cf60c46b7f3ed8452d15244b0be0c990bd5e6 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Thu, 20 Mar 2014 12:37:53 +0100 Subject: [PATCH] Make Carambola 2 use only half of the FLASH sector for storing env variables, so the clocks/PLL configuration can be safety stored at the end of the same sector --- u-boot/include/configs/ap121.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/u-boot/include/configs/ap121.h b/u-boot/include/configs/ap121.h index 45a7f60..5c434d6 100755 --- a/u-boot/include/configs/ap121.h +++ b/u-boot/include/configs/ap121.h @@ -761,6 +761,10 @@ #define CFG_ENV_ADDR 0x9F030000 #define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SECT_SIZE 0x10000 +#elif defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) + #define CFG_ENV_ADDR 0x9F040000 + #define CFG_ENV_SIZE 0x8000 + #define CFG_ENV_SECT_SIZE 0x10000 #else #define CFG_ENV_ADDR 0x9F040000 #define CFG_ENV_SIZE 0x10000 @@ -1031,15 +1035,11 @@ #elif defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) /* * We will store PLL and CLOCK registers - * configuration at the end of U-Boot - * image (4th 64 KiB block) - * It implies that binary image can't - * be bigger than 192 KiB! - * - * TODO: fix me + * configuration at the end of environment + * sector (64 KB, environment uses only half!) */ #define PLL_IN_FLASH_MAGIC 0x504C4C73 - #define PLL_IN_FLASH_DATA_BLOCK_OFFSET 0x00030000 + #define PLL_IN_FLASH_DATA_BLOCK_OFFSET 0x00040000 #define PLL_IN_FLASH_DATA_BLOCK_LENGTH 0x00010000 #define PLL_IN_FLASH_MAGIC_OFFSET 0x0000FFF0 // last 16 bytes #elif defined(CONFIG_FOR_DRAGINO_V2) -- 2.25.1