Mercurial > nand-ecoscentric
changeset 3302:fdccb03963f6
Fix PHY name and added defualt Ethernet interface. Enabled clock for PHY.
| author | vae |
|---|---|
| date | Sun, 14 Apr 2013 23:34:12 +0000 |
| parents | 4ef59b2cf8d3 |
| children | e10148c0a535 |
| files | packages/hal/cortexm/stm32/stm32x0g_eval/current/ChangeLog packages/hal/cortexm/stm32/stm32x0g_eval/current/cdl/hal_cortexm_stm32_stm32x0g_eval.cdl packages/hal/cortexm/stm32/stm32x0g_eval/current/src/stm32x0g_eval_misc.c |
| diffstat | 3 files changed, 28 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/hal/cortexm/stm32/stm32x0g_eval/current/ChangeLog +++ b/packages/hal/cortexm/stm32/stm32x0g_eval/current/ChangeLog @@ -1,3 +1,9 @@ +2013-04-06 Jerzy Dyrda <jerzdy@gmail.com> + + * cdl/hal_cortexm_stm32_stm32x0g_eval.cdl: Fix PHY name and + added defualt Ethernet interface. + * src/stm32x0g_eval_misc.c: Enabled clock for PHY. [ Bugzilla 1001219 ] + 2013-03-09 Ilija Kocho <ilijak@siva.com.mk> * misc/redboot_ROM_FPU.ecm: Add ECM for RedBoot with FPU support.
--- a/packages/hal/cortexm/stm32/stm32x0g_eval/current/cdl/hal_cortexm_stm32_stm32x0g_eval.cdl +++ b/packages/hal/cortexm/stm32/stm32x0g_eval/current/cdl/hal_cortexm_stm32_stm32x0g_eval.cdl @@ -218,9 +218,10 @@ cdl_package CYGPKG_HAL_CORTEXM_STM32_STM default_value 1 requires CYGPKG_DEVS_ETH_CORTEXM_STM32 requires { is_active(CYGPKG_DEVS_ETH_PHY) implies - (1 == CYGHWR_DEVS_ETH_PHY_DP83847) } - requires { is_active(CYGHWR_HAL_CORTEXM_STM32X0G_ETH_PHY_CLOCK_MCO) implies \ + (1 == CYGHWR_DEVS_ETH_PHY_DP8384X) } + requires { is_active(CYGHWR_HAL_CORTEXM_STM32X0G_ETH_PHY_CLOCK_MCO) implies \ (CYGHWR_DEVS_ETH_CORTEXM_STM32_PHY_CLK_MCO == CYGHWR_HAL_CORTEXM_STM32X0G_ETH_PHY_CLOCK_MCO) } + requires { "MII" == CYGSEM_DEVS_ETH_CORTEXM_STM32_INTF } cdl_option CYGHWR_HAL_CORTEXM_STM32X0G_ETH_PHY_CLOCK_MCO { display "Use MCO as PHY clock"
--- a/packages/hal/cortexm/stm32/stm32x0g_eval/current/src/stm32x0g_eval_misc.c +++ b/packages/hal/cortexm/stm32/stm32x0g_eval/current/src/stm32x0g_eval_misc.c @@ -41,7 +41,7 @@ // // Author(s): jlarmour based on stm3210e by nickg // Date: 2008-07-30 -// Description: +// Description: // //####DESCRIPTIONEND#### // @@ -82,12 +82,12 @@ // This is run to set up the basic system, including GPIO setting, // clock feeds, power supply, and memory initialization. This code // runs before the DATA is copied from ROM and the BSS cleared, hence -// it cannot make use of static variables or data tables. +// it cannot make use of static variables or data tables. __externC void hal_system_init( void ) { CYG_ADDRESS base; - + // Enable peripheral clocks in RCC base = CYGHWR_HAL_STM32_RCC; @@ -113,7 +113,7 @@ BIT_(CYGHWR_HAL_STM32_RCC_AHB3ENR_FSMC) ); #if defined(CYG_HAL_STARTUP_ROM) | defined(CYG_HAL_STARTUP_ROMINT) | defined(CYG_HAL_STARTUP_SRAM) - + // Reset FSMC in case it was already enabled. This should set // all regs back to default documented values, so we don't need // to do any precautionary resets. @@ -123,6 +123,18 @@ HAL_WRITE_UINT32(base+CYGHWR_HAL_STM32_RCC_AHB3RSTR, 0 ); #endif +#if defined(CYGHWR_HAL_CORTEXM_STM32X0G_ETH_PHY_CLOCK_MCO) + // Use HSE clock as the MCO1 clock signals for PHY + { + cyg_uint32 acr; + + HAL_READ_UINT32(base + CYGHWR_HAL_STM32_RCC_CFGR, acr); + acr |= CYGHWR_HAL_STM32_RCC_CFGR_MCO1_HSE | + CYGHWR_HAL_STM32_RCC_CFGR_MCO1PRE_1; + HAL_WRITE_UINT32(base + CYGHWR_HAL_STM32_RCC_CFGR, acr); + } +#endif + // Set all unused GPIO lines to input with pull down to prevent // them floating and annoying any external hardware. @@ -248,7 +260,7 @@ // Latency has to be set before clock is switched to a higher speed. { cyg_uint32 acr; - + base = CYGHWR_HAL_STM32_FLASH; HAL_READ_UINT32( base+CYGHWR_HAL_STM32_FLASH_ACR, acr ); @@ -314,10 +326,10 @@ static struct } hal_data_access[] = { { CYGMEM_REGION_ram, CYGMEM_REGION_ram+CYGMEM_REGION_ram_SIZE-1 }, // External SRAM -#ifdef CYGMEM_REGION_sram +#ifdef CYGMEM_REGION_sram { CYGMEM_REGION_sram, CYGMEM_REGION_sram+CYGMEM_REGION_sram_SIZE-1 }, // On-chip SRAM #endif -#ifdef CYGMEM_REGION_flash +#ifdef CYGMEM_REGION_flash { CYGMEM_REGION_flash, CYGMEM_REGION_flash+CYGMEM_REGION_flash_SIZE-1 }, // On-chip flash #endif { 0xE0000000, 0x00000000-1 }, // Cortex-M peripherals
