soc: atmel: move init code from SYS_INIT to hooks (51c771ec) · Commits · Wenxi XU / zephyr

soc/atmel/sam/same70/Kconfig

+1 −0

+3 −8

Original line number	Diff line number	Diff line
		@@ -135,23 +135,18 @@ void soc_reset_hook(void)
		clock_init();
		}

		extern void atmel_same70_config(void);
		/**
		* @brief Perform basic hardware initialization at boot.
		*
		* This needs to be run at the very beginning.
		* So the init priority has to be 0 (zero).
		*
		* @return 0
		*/
		static int atmel_same70_init(void)
		void soc_early_init_hook(void)
		{
		/* Check that the CHIP CIDR matches the HAL one */
		if (CHIPID->CHIPID_CIDR != CHIP_CIDR) {
		LOG_WRN("CIDR mismatch: chip = 0x%08x vs HAL = 0x%08x",
		(uint32_t)CHIPID->CHIPID_CIDR, (uint32_t)CHIP_CIDR);
		}

		return 0;
		atmel_same70_config();
		}

		SYS_INIT(atmel_same70_init, PRE_KERNEL_1, 0);

+1 −6

Original line number	Diff line number	Diff line
		@@ -18,10 +18,8 @@
		*
		* This should be run early during the boot process but after basic hardware
		* initialization is done.
		*
		* @return 0
		*/
		static int atmel_same70_config(void)
		void atmel_same70_config(void)
		{
		if (IS_ENABLED(CONFIG_SOC_ATMEL_SAM_DISABLE_ERASE_PIN)) {
		/* Disable ERASE function on PB12 pin, this is controlled
		@@ -59,7 +57,4 @@ static int atmel_same70_config(void)
		MATRIX->CCFG_SYSIO \|= CCFG_SYSIO_SYSIO5;
		}

		return 0;
		}

		SYS_INIT(atmel_same70_config, PRE_KERNEL_1, 1);

+1 −0

+3 −8

Original line number	Diff line number	Diff line
		@@ -132,23 +132,18 @@ void soc_reset_hook(void)
		clock_init();
		}

		extern void atmel_samv71_config(void);
		/**
		* @brief Perform basic hardware initialization at boot.
		*
		* This needs to be run at the very beginning.
		* So the init priority has to be 0 (zero).
		*
		* @return 0
		*/
		static int atmel_samv71_init(void)
		void soc_early_init_hook(void)
		{
		/* Check that the CHIP CIDR matches the HAL one */
		if (CHIPID->CHIPID_CIDR != CHIP_CIDR) {
		LOG_WRN("CIDR mismatch: chip = 0x%08x vs HAL = 0x%08x",
		(uint32_t)CHIPID->CHIPID_CIDR, (uint32_t)CHIP_CIDR);
		}

		return 0;
		atmel_samv71_config();
		}

		SYS_INIT(atmel_samv71_init, PRE_KERNEL_1, 0);