Browse code Merge commit 'for-v0.4/05.20^' into for-v0.4 Conflicts: plat/fvp/bl32_plat_setup.c plat/fvp/platform.mk services/spd/tspd/tspd_main.c Change-Id: Ib4bad39a8a476a6b1796298f95dfb97c8b100975 for-v0.4/05.21
commit 421c572a7eab3efbdb769908fb1aa36ef361465a 2 parents 558c76b + 956e09a Andrew Thoelke authored on 21 May 2014

Showing 38 changed files

• bl31/aarch64/bl31_entrypoint.S
• bl31/aarch64/runtime_exceptions.S
• bl31/bl31.mk
• bl31/bl31_main.c
• bl31/context_mgmt.c
• bl31/interrupt_mgmt.c
• bl31/runtime_svc.c
• bl32/tsp/aarch64/tsp_entrypoint.S
• bl32/tsp/aarch64/tsp_exceptions.S
• bl32/tsp/tsp-fvp.mk
• bl32/tsp/tsp.mk
• bl32/tsp/tsp_interrupt.c
• bl32/tsp/tsp_main.c
• bl32/tsp/tsp_timer.c
• docs/firmware-design.md
• docs/user-guide.md
• drivers/arm/gic/gic_v2.c
• include/bl31/cm_macros.S
• include/bl31/context_mgmt.h
• include/bl31/interrupt_mgmt.h
• include/bl31/runtime_svc.h
• include/bl31/services/psci.h
• include/bl32/payloads/tsp.h
• include/drivers/arm/gic_v2.h
• include/lib/aarch64/arch.h
• include/lib/aarch64/arch_helpers.h
• lib/aarch64/sysreg_helpers.S
• plat/fvp/bl32_plat_setup.c
• plat/fvp/plat_gic.c
• plat/fvp/platform.h
• plat/fvp/platform.mk
• services/spd/tspd/tspd_common.c
• services/spd/tspd/tspd_main.c
• services/spd/tspd/tspd_pm.c
• services/spd/tspd/tspd_private.h
• services/std_svc/psci/psci_entry.S
• services/std_svc/psci/psci_main.c
• tools/fip_create/fip_create.c

Ignore Space Show notes View bl31/aarch64/bl31_entrypoint.S

Ignore Space Show notes View bl31/aarch64/runtime_exceptions.S

Ignore Space Show notes View bl31/bl31.mk

Ignore Space Show notes View bl31/bl31_main.c

Ignore Space Show notes View bl31/context_mgmt.c

Ignore Space Show notes View bl31/interrupt_mgmt.c 0 → 100644

Ignore Space Show notes View bl31/runtime_svc.c

Ignore Space Show notes View bl32/tsp/aarch64/tsp_entrypoint.S

Ignore Space Show notes View bl32/tsp/aarch64/tsp_exceptions.S 0 → 100644

Ignore Space Show notes View bl32/tsp/tsp-fvp.mk

Ignore Space Show notes View bl32/tsp/tsp.mk

Ignore Space Show notes View bl32/tsp/tsp_interrupt.c 0 → 100644

Ignore Space Show notes View bl32/tsp/tsp_main.c

Ignore Space Show notes View bl32/tsp/tsp_timer.c 0 → 100644

Ignore Space Show notes View docs/firmware-design.md

Ignore Space Show notes View docs/user-guide.md

Ignore Space Show notes View drivers/arm/gic/gic_v2.c

Show notes View include/bl31/cm_macros.S 100644 → 0

Ignore Space Show notes View include/bl31/context_mgmt.h

Ignore Space Show notes View include/bl31/interrupt_mgmt.h 0 → 100644

Ignore Space Show notes View include/bl31/runtime_svc.h

Ignore Space Show notes View include/bl31/services/psci.h

Ignore Space Show notes View include/bl32/payloads/tsp.h

Ignore Space Show notes View include/drivers/arm/gic_v2.h

Ignore Space Show notes View include/lib/aarch64/arch.h

Ignore Space Show notes View include/lib/aarch64/arch_helpers.h

Ignore Space Show notes View lib/aarch64/sysreg_helpers.S

Ignore Space Show notes View plat/fvp/bl32_plat_setup.c

Ignore Space Show notes View plat/fvp/plat_gic.c

Ignore Space Show notes View plat/fvp/platform.h

Ignore Space Show notes View plat/fvp/platform.mk

Ignore Space Show notes View services/spd/tspd/tspd_common.c

Ignore Space Show notes View services/spd/tspd/tspd_main.c

Ignore Space Show notes View services/spd/tspd/tspd_pm.c

Ignore Space Show notes View services/spd/tspd/tspd_private.h

Ignore Space Show notes View services/std_svc/psci/psci_entry.S

Ignore Space Show notes View services/std_svc/psci/psci_main.c

Ignore Space Show notes View tools/fip_create/fip_create.c

Show line notes below