From ec2d3fb6de7acc15fd239404f8a4cc6fd45676a9 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Fri, 5 Jun 2015 09:40:47 -0400 Subject: [PATCH] Eliminate Viper branding Gets rid of references to the obsolete OS name. (Note that removing the build system comment entirely makes sense, since there are no other comments for anything else in the file.) Change-Id: I4473b016c1c85be48ac9ab8d5b8f6a5b11dd58d0 Signed-off-by: Allan Stephens --- arch/arc/core/fast_irq.s | 2 +- arch/arc/core/regular_irq.s | 2 +- scripts/Makefile.preparch | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arc/core/fast_irq.s b/arch/arc/core/fast_irq.s index 3a6969f3b3f..5405ed995e7 100644 --- a/arch/arc/core/fast_irq.s +++ b/arch/arc/core/fast_irq.s @@ -133,7 +133,7 @@ SECTION_FUNC(TEXT, _firq_exit) lr r3, [_ARC_V2_AUX_IRQ_ACT] - /* Viper on ARCv2 always runs in kernel mode, so assume bit31 [U] in + /* the OS on ARCv2 always runs in kernel mode, so assume bit31 [U] in * AUX_IRQ_ACT is always 0: if the contents of AUX_IRQ_ACT is not 1, it * means that another bit is set so an interrupt was interrupted. */ diff --git a/arch/arc/core/regular_irq.s b/arch/arc/core/regular_irq.s index ab89a4aa8aa..85cadfb7dbe 100644 --- a/arch/arc/core/regular_irq.s +++ b/arch/arc/core/regular_irq.s @@ -96,7 +96,7 @@ SECTION_FUNC(TEXT, _rirq_exit) asl r0, 1, r0 - /* Viper on ARCv2 always runs in kernel mode, so assume bit31 [U] in + /* the OS on ARCv2 always runs in kernel mode, so assume bit31 [U] in * AUX_IRQ_ACT is always 0: if the contents of AUX_IRQ_ACT is greater * than FFS(AUX_IRQ_ACT), it means that another bit is set so an * interrupt was interrupted. diff --git a/scripts/Makefile.preparch b/scripts/Makefile.preparch index 4e45204a2a3..64fc724bad5 100644 --- a/scripts/Makefile.preparch +++ b/scripts/Makefile.preparch @@ -32,7 +32,6 @@ define filechk_prj.vpf cat $(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.vpf;) endef -#Specific source code generation for Viper misc/generated/sysgen/prj.vpf: $(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.vpf \ $(PROJECT_BASE)/$(VPFILE) \ include/config/auto.conf FORCE